diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-30 16:02:19 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-30 16:02:19 -0700 |
| commit | 058ad9e6ab4a00ff66046d94c2129056011ebee9 (patch) | |
| tree | 16edf1420d8c73b86100e8a94cf98b08e45a8a9b /src/i830_memory.c | |
| parent | cec9fc6f6cffce186606f39982d0d78ff7c63bbf (diff) | |
Don't try to pin buffers in KMS mode
The only things we try to pin in KMS mode are the cursor objects and
front buffer, and those are taken care of by the kernel anyway, so we
shouldn't even bother trying to pin them (well, not entirely true,
XvMC tries to pin as well, but it needs work w/KMS anyway).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index 5e07213d..387e52b2 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -202,7 +202,7 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem) if (mem == NULL || mem->bound) return TRUE; - if (mem->bo != NULL) { + if (mem->bo != NULL && !pI830->use_drm_mode) { if (dri_bo_pin(mem->bo, mem->alignment) != 0) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to pin %s: %s\n", @@ -249,7 +249,7 @@ i830_unbind_memory(ScrnInfoPtr pScrn, i830_memory *mem) !pI830->kernel_exec_fencing) i830_clear_tiling(pScrn, mem->fence_nr); - if (mem->bo != NULL) { + if (mem->bo != NULL && !pI830->use_drm_mode) { if (dri_bo_unpin(mem->bo) == 0) { mem->bound = FALSE; /* Give buffer obviously wrong offset/end until it's re-pinned. */ |