intel-gtt: drop unnecessary conditions in intel_gtt_stolen_entries
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 27 Aug 2010 14:25:54 +0000 (16:25 +0200)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Sep 2010 20:20:11 +0000 (21:20 +0100)
The dedection function in drm/i915/i915_dma.c works without it, so
drop it here, too. All the values are disdinct, anyway.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/char/agp/intel-gtt.c

index 79eb106c6f08bc5f765ef234de6ae45c0d13f3fd..a620296c081009930217b9efe00bf421d72e5333 100644 (file)
@@ -704,54 +704,28 @@ static unsigned int intel_gtt_stolen_entries(void)
                        stolen_size = MB(32);
                        break;
                case I915_GMCH_GMS_STOLEN_48M:
-                       /* Check it's really I915G */
-                       if (IS_I915 || IS_I965 || IS_G33 || IS_G4X)
-                               stolen_size = MB(48);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(48);
                        break;
                case I915_GMCH_GMS_STOLEN_64M:
-                       /* Check it's really I915G */
-                       if (IS_I915 || IS_I965 || IS_G33 || IS_G4X)
-                               stolen_size = MB(64);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(64);
                        break;
                case G33_GMCH_GMS_STOLEN_128M:
-                       if (IS_G33 || IS_I965 || IS_G4X)
-                               stolen_size = MB(128);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(128);
                        break;
                case G33_GMCH_GMS_STOLEN_256M:
-                       if (IS_G33 || IS_I965 || IS_G4X)
-                               stolen_size = MB(256);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(256);
                        break;
                case INTEL_GMCH_GMS_STOLEN_96M:
-                       if (IS_I965 || IS_G4X)
-                               stolen_size = MB(96);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(96);
                        break;
                case INTEL_GMCH_GMS_STOLEN_160M:
-                       if (IS_I965 || IS_G4X)
-                               stolen_size = MB(160);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(160);
                        break;
                case INTEL_GMCH_GMS_STOLEN_224M:
-                       if (IS_I965 || IS_G4X)
-                               stolen_size = MB(224);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(224);
                        break;
                case INTEL_GMCH_GMS_STOLEN_352M:
-                       if (IS_I965 || IS_G4X)
-                               stolen_size = MB(352);
-                       else
-                               stolen_size = 0;
+                       stolen_size = MB(352);
                        break;
                default:
                        stolen_size = 0;