diff options
| author | Eric Anholt <eric@anholt.net> | 2008-09-10 14:10:26 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-09-10 14:10:26 -0700 |
| commit | 7e8eb6e20b6b1a2a3c1ef28f694fa23c68a15c48 (patch) | |
| tree | 413bf8c459e1c02e216ed35b21c2b264a78d911a /src/i830_dri.c | |
| parent | fba9b5aff450d874ef98cafd3ecc0fd85f9597b5 (diff) | |
| parent | 58a3817305ef1455a11be6ead8a8521dfc5875c7 (diff) | |
Merge branch 'master' into dri2
Conflicts:
src/i830_batchbuffer.c
src/i830_display.c
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 3168a4b0..4bfe2867 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -838,6 +838,11 @@ I830DRIDoMappings(ScreenPtr pScreen) return FALSE; } + if (pI830->memory_manager == NULL) + intel_bufmgr_fake_set_last_dispatch(pI830->bufmgr, + (volatile unsigned int *) + &sarea->last_dispatch); + /* init to zero to be safe */ sarea->front_handle = 0; sarea->back_handle = 0; @@ -1548,7 +1553,7 @@ i830_name_buffer (ScrnInfoPtr pScrn, i830_memory *mem) if (!mem->gem_name) { int ret; - ret = intel_bo_flink(mem->bo, &mem->gem_name); + ret = dri_bo_flink(mem->bo, &mem->gem_name); if (ret != 0) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |