summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2009-03-13 16:22:33 +0800
committerEric Anholt <eric@anholt.net>2009-04-01 12:00:00 -0700
commit4a8df45894d26dc503013ea630927731c24be6b8 (patch)
tree577a512522dba9ccf3bd4a38e683cf2c9808479f /drivers/gpu
parent6b731a65c86119da808b3687e0bbb8f18ab137ad (diff)
downloadop-kernel-dev-4a8df45894d26dc503013ea630927731c24be6b8.zip
op-kernel-dev-4a8df45894d26dc503013ea630927731c24be6b8.tar.gz
drm/i915: correctly set IGD device's gtt size for KMS.
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 85549f6..8ce57f9 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -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;
OpenPOWER on IntegriCloud