diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2009-03-11 11:10:57 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2009-03-11 11:36:57 -0400 |
| commit | 73db44e7ac524e84e5f0fda2d60069a9e954ad1b (patch) | |
| tree | da3873ac18903d3557421a838c55fb0ade2fef6a /src/i830_memory.c | |
| parent | 2fcf4fcccfe7cfa1425985d21a144137eca07f4e (diff) | |
Drop Legacy3D option, only use fixed texture space with non-gem.
With this change, we always expect the 3D driver to use GEM textures
when the 2D driver uses GEM. When GEM is not available or disabled,
we fall back to legacy fixed textures.
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index e98c914b..96e17633 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -504,9 +504,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) mmsize -= ROUND_TO_PAGE(3 * pScrn->displayWidth * pI830->cpp * pScrn->virtualY); } - /* Classic textures are fixed. */ - if (pI830->allocate_classic_textures) - mmsize -= MB(32); /* Overlay and cursors, if physical, need to be allocated outside * of the kernel memory manager. */ @@ -566,6 +563,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size) i830_free_memory(pScrn, pI830->memory_manager); pI830->memory_manager = NULL; } + } else { + pI830->allocate_classic_textures = TRUE; } #endif /* XF86DRI */ |