diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-06-11 15:10:06 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-06-11 15:10:06 +0100 |
commit | 1392f296a3fc94bb64abe4c3370c2f3cd52bef9f (patch) | |
tree | 4f8a282721bd472631b2c388b0a440d3aed2aa1c /src/sna/kgem.h | |
parent | 7d91051c50210560dbd93a9e36f30d9f74ce9133 (diff) |
sna: Mollify an assert to allow us to call busy_ioctl on a GTT write
The code was being careful in making sure that only a BO with an
outstanding GPU write was being flushed. We need to relax that
assertion to allow us to call busy_ioctl after only GTT writes.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/kgem.h')
-rw-r--r-- | src/sna/kgem.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/sna/kgem.h b/src/sna/kgem.h index b7355d47..aa8097a4 100644 --- a/src/sna/kgem.h +++ b/src/sna/kgem.h @@ -338,10 +338,15 @@ static inline void kgem_bo_flush(struct kgem *kgem, struct kgem_bo *bo) return; /* If the kernel fails to emit the flush, then it will be forced when - * we assume direct access. And as the useual failure is EIO, we do - * not actualy care. + * we assume direct access. And as the usual failure is EIO, we do + * not actually care. */ __kgem_flush(kgem, bo); + + /* Whatever actually happens, we can regard the GTT write domain + * as being flushed. + */ + bo->gtt_dirty = false; } static inline struct kgem_bo *kgem_bo_reference(struct kgem_bo *bo) |