diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-05-01 12:35:21 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-05-01 12:35:21 -0700 |
| commit | a66f2c01f7d557d860883346671fb864807dbdca (patch) | |
| tree | b0ec9b5e2451578301adffaa363633af9a9a2c1a /src/i830_memory.c | |
| parent | a555e28e5afc81969ef7b28482e654cc26b3a446 (diff) | |
Stop doing the BIOS memory size tweaking now that we don't ask the BIOS about
what modes are available.
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index 433aa47d..2d8610af 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -65,10 +65,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static int nextTile = 0; static unsigned int tileGeneration = -1; -#ifndef ALLOCATE_ALL_BIOSMEM -#define ALLOCATE_ALL_BIOSMEM 1 -#endif - static unsigned long GetBestTileAlignment(unsigned long size) { @@ -252,11 +248,7 @@ I830FreeVidMem(ScrnInfoPtr pScrn, I830MemRange *range) * USE CAUTION when changing anything here... */ I830MemPool *Pool = range->Pool; - if (pI830->overrideBIOSMemSize && - pI830->BIOSMemorySize > pI830->StolenMemory.Size) - Pool->Total.End = pI830->BIOSMemorySize; - else - Pool->Total.End = pI830->StolenMemory.End; + Pool->Total.End = pI830->StolenMemory.End; if (pI830->StolenOnly) Pool->Free.End += range->Size; @@ -1078,13 +1070,6 @@ I830ResetAllocations(ScrnInfoPtr pScrn, const int flags) pI830->MemoryAperture.Size = pI830->FbMapSize - pI830->StolenMemory.Size; pI830->StolenPool.Fixed = pI830->StolenMemory; pI830->StolenPool.Total = pI830->StolenMemory; -#if ALLOCATE_ALL_BIOSMEM - if (pI830->overrideBIOSMemSize && - pI830->BIOSMemorySize > pI830->StolenMemory.Size) { - pI830->StolenPool.Total.End = pI830->BIOSMemorySize; - pI830->StolenPool.Total.Size = pI830->BIOSMemorySize; - } -#endif pI830->StolenPool.Free = pI830->StolenPool.Total; pI830->FreeMemory = pI830->TotalVideoRam - pI830->StolenPool.Total.Size; pI830->allocatedMemory = 0; |