xf86-video-intel: src/sna/sna_accel.c src/sna/sna_reg.h src/sna/sna_render.c

[GitLab Mirror]

 src/sna/sna_accel.c  |    2 --
 src/sna/sna_reg.h    |    1 -
 src/sna/sna_render.c |    3 ---
 3 files changed, 6 deletions(-)

New commits:
commit d90a2ff1a6f338fa70fc9a110d9f7b0e622c8a57
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Dec 9 14:39:40 2019 +0000

    Revert "sna: Close each client op with an arbitrartion check"
    
    This reverts commit b5ac286c9bb0 as it escaped before being completed.
    It proved it's worth in preventing sna from hogging the GPU for too long
    under x11perf stress, but it didn't check to see if there was enough
    space left in the batch before emitting the dword. Simply revert the
    patch for now.
    
    Reported-by: Matti Hämäläinen <ccr at tnsp.org>
    Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/issues/174
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 98084bb0..ee857a14 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5302,8 +5302,6 @@ inline static void blt_done(struct sna *sna)
 		DBG(("%s: flushing BLT operation on empty ring\n",
 		     __FUNCTION__));
 		_kgem_submit(&sna->kgem);
-	} else {
-		sna->kgem.batch[sna->kgem.nbatch++] = MI_ARB_CHECK;
 	}
 }
 
diff --git a/src/sna/sna_reg.h b/src/sna/sna_reg.h
index 0531fabf..92a1ae57 100644
--- a/src/sna/sna_reg.h
+++ b/src/sna/sna_reg.h
@@ -14,7 +14,6 @@
 /* broadwater flush bits */
 #define BRW_MI_GLOBAL_SNAPSHOT_RESET   (1 << 3)
 
-#define MI_ARB_CHECK		(0x5 << 23)
 #define MI_BATCH_BUFFER_END	(0xA << 23)
 
 /* Noop */
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index 7145da90..904d4400 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -32,7 +32,6 @@
 #include "sna.h"
 #include "sna_render.h"
 #include "sna_render_inline.h"
-#include "sna_reg.h"
 #include "fb/fbpict.h"
 
 #define NO_REDIRECT 0
@@ -2130,8 +2129,6 @@ sna_render_composite_redirect_done(struct sna *sna,
 
 		kgem_bo_destroy(&sna->kgem, op->dst.bo);
 	}
-
-	batch_emit(sna, MI_ARB_CHECK);
 }
 
 static bool