summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-12-10 20:32:56 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-12-10 23:34:51 +0000
commitb3816cf3a99d23d0c3ab4cd716b24ea544a07283 (patch)
tree91fe8ec727f390a1f758a9d611be1db7f3cf486d
parentb5a6bc9e33a2797c926969e1f98b4a9a796248c5 (diff)
sna: Remove assertions that external bo are not busy
We have to be careful to assume bo via exposed are under our full control, in particular not to assert their state. :( Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/kgem.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 34ce7459..f5ad1118 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -214,7 +214,6 @@ Bool kgem_bo_write(struct kgem *kgem, struct kgem_bo *bo,
if (gem_write(kgem->fd, bo->handle, 0, length, data))
return FALSE;
- assert(!kgem_busy(kgem, bo->handle));
bo->needs_flush = false;
if (bo->gpu)
kgem_retire(kgem);
@@ -728,7 +727,6 @@ bool kgem_retire(struct kgem *kgem)
DBG(("%s: moving %d to inactive\n",
__FUNCTION__, bo->handle));
bo->purged = true;
- assert(!kgem_busy(kgem,bo->handle));
list_move(&bo->list,
inactive(kgem, bo->size));
retired = true;
@@ -1812,14 +1810,11 @@ void *kgem_bo_map(struct kgem *kgem, struct kgem_bo *bo, int prot)
{
void *ptr;
- assert(prot == PROT_READ || !kgem_busy(kgem, bo->handle));
-
ptr = gem_mmap(kgem->fd, bo->handle, bo->size, prot);
if (ptr == NULL)
return NULL;
if (prot & PROT_WRITE) {
- assert(!kgem_busy(kgem, bo->handle));
bo->needs_flush = false;
if (bo->gpu)
kgem_retire(kgem);