From c57bf7318e5c837d154f611c090f8d6c6eb64ced Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 16 Nov 2014 14:58:37 +0100 Subject: [PATCH] Revert "linux: add upstream patch" This reverts commit 230295becb69e18718567355017e977db73ce96d. Conflicts: packages/linux/patches/3.17.3/linux-999.10-drm_intel_gen7-stall.patch --- .../linux-999.10-drm_intel_gen7-stall.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 packages/linux/patches/3.17.3/linux-999.10-drm_intel_gen7-stall.patch diff --git a/packages/linux/patches/3.17.3/linux-999.10-drm_intel_gen7-stall.patch b/packages/linux/patches/3.17.3/linux-999.10-drm_intel_gen7-stall.patch deleted file mode 100644 index 635ea59d18..0000000000 --- a/packages/linux/patches/3.17.3/linux-999.10-drm_intel_gen7-stall.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dd604c15ffcdba52a5b6ac1bbc1c385bdcf7af6c Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Fri, 14 Nov 2014 11:02:41 +0000 -Subject: [PATCH] gen7-stall - -Signed-off-by: Chris Wilson ---- - drivers/gpu/drm/i915/intel_ringbuffer.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c -index ae09258..b39d1e4 100644 ---- a/drivers/gpu/drm/i915/intel_ringbuffer.c -+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c -@@ -367,6 +367,7 @@ gen7_render_ring_flush(struct intel_engine_cs *ring, - */ - flags |= PIPE_CONTROL_QW_WRITE; - flags |= PIPE_CONTROL_GLOBAL_GTT_IVB; -+ flags |= PIPE_CONTROL_STALL_AT_SCOREBOARD; - - /* Workaround: we must issue a pipe_control with CS-stall bit - * set before a pipe_control command that has the state cache --- -1.9.1 -