diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-02-01 18:05:35 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-02-01 18:05:35 +0000 |
| commit | a5561f13498066922b54af04cc71549322ce0e3b (patch) | |
| tree | 1b817120da03a525d9e114abdd733c5f9ef31e80 | |
| parent | d3ff1cb9d7f788002337b1e6c4c81c58112b85b1 (diff) | |
sna: Do not add the INPLACE hint if we have the ASYNC hint set
If the caller is preparing to use the GPU to rendering into the CPU bo,
it will request an ASYNC migration. In those cases, we do not want to
substitute it with an INPLACE operation.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_accel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index bb2ecb58..87e0c0c0 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -1908,7 +1908,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable, } if (USE_INPLACE && - (flags & MOVE_READ) == 0 && + (flags & (MOVE_READ | MOVE_ASYNC_HINT)) == 0 && (priv->flush || box_inplace(pixmap, ®ion->extents))) { DBG(("%s: marking for inplace hint (%d, %d)\n", __FUNCTION__, priv->flush, box_inplace(pixmap, ®ion->extents))); |