diff options
| author | Keith Packard <keithp@keithp.com> | 2009-07-08 11:53:13 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-07-10 18:26:59 -0700 |
| commit | 7b273732f70e91df8b41d5c48e1379271557dd8e (patch) | |
| tree | 728d1d19a346c4569b7c2da4834badfe582dc37d /src/i830_driver.c | |
| parent | 56bfee8705f5d7d965227013b205dbc4c93e220c (diff) | |
Allocate GTT space for GEM only under UMS
GEM requires GTT space to map objects. Under KMS, the kernel driver has
already provided all available GTT space to GEM, so the X server need not do
anything.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index e5e5fd7a..fe2565c0 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2674,8 +2674,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!pI830->use_drm_mode) I830MapMMIO(pScrn); - /* Need FB mapped to set up the fake bufmgr if we end up doing that - * in i830_memory_init() -> i830_allocator_init(). + /* Need FB mapped to access non-GEM objects like + * a UMS frame buffer, or the fake bufmgr. */ if (!pI830->use_drm_mode) { if (!I830MapMem(pScrn)) @@ -2701,10 +2701,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!miSetPixmapDepths()) return FALSE; - i830_init_bufmgr(pScrn); - - pScrn->fbOffset = pI830->front_buffer->offset; - if (!pI830->use_drm_mode) { vgaHWSetMmioFuncs(hwp, pI830->MMIOBase, 0); vgaHWGetIOBase(hwp); |