Revert "linux: add upstream patch"

This reverts commit 230295becb69e18718567355017e977db73ce96d.

Conflicts:
	packages/linux/patches/3.17.3/linux-999.10-drm_intel_gen7-stall.patch
This commit is contained in:
Stephan Raue 2014-11-16 14:58:37 +01:00
parent 1fb2681772
commit c57bf7318e

View File

@ -1,25 +0,0 @@
From dd604c15ffcdba52a5b6ac1bbc1c385bdcf7af6c Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 14 Nov 2014 11:02:41 +0000
Subject: [PATCH] gen7-stall
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
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