xf86-video-intel: src/sna/sna_dri2.c

[Chris Wilson]

 src/sna/sna_dri2.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit b48d4a7917ab793526be47559becc64aacd347ae
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jan 22 20:11:31 2016 +0000

    sna/dri2: Tweak enginement placement on inherited render targets
    
    The main motivation is try and isolate from an upcoming API change in
    busy-ioctl, but is also based on the observation that we now only care
    about write-synchronisation.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 0e18456..5450434 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1110,13 +1110,12 @@ static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kg
 	 * The ultimate question is whether preserving the ring outweighs
 	 * the cost of the query.
 	 */
-	if (popcount(busy.busy >> 16) > 1)
-		mode = busy.busy & 0xffff ? KGEM_BLT : KGEM_RENDER;
-	else if (busy.busy & (0xfffe << 16))
+	mode = KGEM_RENDER;
+	if ((busy.busy & 0xffff) == KGEM_BLT)
 		mode = KGEM_BLT;
-	else
-		mode = KGEM_RENDER;
-	kgem_bo_mark_busy(&sna->kgem, busy.handle == src->handle ? src : dst, mode);
+	kgem_bo_mark_busy(&sna->kgem,
+			  busy.handle == src->handle ? src : dst,
+			  mode);
 	_kgem_set_mode(&sna->kgem, mode);
 }