drm/i915: correctly set IGD device's gtt size for KMS.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Thursday, April 2, 2009 - 10:07 pm

Gitweb:     http://git.kernel.org/linus/4a8df45894d26dc503013ea630927731c24be6b8
Commit:     4a8df45894d26dc503013ea630927731c24be6b8
Parent:     6b731a65c86119da808b3687e0bbb8f18ab137ad
Author:     Shaohua Li <shaohua.li@intel.com>
AuthorDate: Fri Mar 13 16:22:33 2009 +0800
Committer:  Eric Anholt <eric@anholt.net>
CommitDate: Wed Apr 1 12:00:00 2009 -0700

    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>
---
 drivers/gpu/drm/i915/i915_dma.c |    2 +-
 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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
drm/i915: correctly set IGD device's gtt size for KMS., Linux Kernel Mailing ..., (Thu Apr 2, 10:07 pm)