diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-29 15:01:39 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-29 15:02:45 -0800 |
| commit | 359dc81c07901665da0f86c573c096fa1661cdd2 (patch) | |
| tree | 9adb1e8a72e17b2a76df9774b86c12d38cc07684 /src/i830_driver.c | |
| parent | 9e4e7d4fa25a64a2494e7531967599142e60e716 (diff) | |
Revert "Don't allocate stuff in the first 256K of video memory (GATT?)"
This reverts commit 997e8c9bb4235cab1fff4738387df9afcbea0a03.
The GTT is definitely located at the end of stolen memory. This commit
apparently worked around mis-estimation of the GTT size.
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 1e619e44..39ffa542 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -806,7 +806,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) pointer pVBEModule = NULL; Bool enable; const char *chipname; - int mem_skip; #ifdef XF86DRI unsigned long savedMMSize; #endif @@ -1126,15 +1125,8 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) /* * Get the pre-allocated (stolen) memory size. */ - - mem_skip = 0; - - /* On 965, it looks like the GATT table is inside the aperture? */ - if (IS_I965G(pI830)) - mem_skip = pI830->FbMapSize >> 10; - - pI830->StolenMemory.Size = I830DetectMemory(pScrn) - mem_skip; - pI830->StolenMemory.Start = mem_skip; + pI830->StolenMemory.Size = I830DetectMemory(pScrn); + pI830->StolenMemory.Start = 0; pI830->StolenMemory.End = pI830->StolenMemory.Size; /* Find the maximum amount of agpgart memory available. */ |