]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm/i915: correctly set IGD device's gtt size for KMS.
authorShaohua Li <shaohua.li@intel.com>
Fri, 13 Mar 2009 08:22:33 +0000 (16:22 +0800)
committerEric Anholt <eric@anholt.net>
Wed, 1 Apr 2009 19:00:00 +0000 (12:00 -0700)
IGD device only has last 1 page used by GTT.  This should match the AGP gart
code.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_dma.c

index 85549f615b1f23560f78831c550c3d1747a4358f..8ce57f9b11fa80de0db3f5d557d41fe3efd96ed7 100644 (file)
@@ -922,7 +922,7 @@ static int i915_probe_agp(struct drm_device *dev, unsigned long *aperture_size,
         * Some of the preallocated space is taken by the GTT
         * and popup.  GTT is 1K per MB of aperture size, and popup is 4K.
         */
-       if (IS_G4X(dev))
+       if (IS_G4X(dev) || IS_IGD(dev))
                overhead = 4096;
        else
                overhead = (*aperture_size / 1024) + 4096;