diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-10 16:14:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-10 22:50:01 -0700 |
| commit | 339f00e340c3a9c8ac8f17147e37906494ef370b (patch) | |
| tree | eed6c6e3303b055089f792abab07e9da45b7c7e2 /src/i830_memory.c | |
| parent | e930c0dc5b5f98d256a4167ed70ba813c88924d2 (diff) | |
[gem] Don't set up the ring in GEM mode, as that'll be handled by the kernel.
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index db99d97e..36131672 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -996,7 +996,7 @@ i830_allocate_ringbuffer(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); - if (pI830->noAccel || pI830->LpRing->mem != NULL) + if (pI830->noAccel || pI830->memory_manager || pI830->LpRing->mem != NULL) return TRUE; /* We don't have any mechanism in the DRM yet to alert it that we've moved @@ -1632,8 +1632,10 @@ i830_allocate_texture_memory(ScrnInfoPtr pScrn) size / 1024); return FALSE; } - /* The offset must stay constant currently because we don't ever update - * the DRI maps after screen init. + /* Now that the DRM uses the sarea to get the offsets of the buffers, + * and we update the classic DRM mappings and the sarea contents on + * changes, the NEED_LIFETIME_FIXED is no longer true and should be + * made conditional on DRM version. */ pI830->textures = i830_allocate_memory(pScrn, "classic textures", size, GTT_PAGE_SIZE, |