summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2017-03-24 15:17:23 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2017-03-24 17:10:10 +0000
commite02d9d76bf4de91d6eddf73345c5e8a9ae5a5f9f (patch)
tree16dcd8fce267aaace4f585753f88a0a99ebc0fd1
parent5d64c120c046c287382373df52b9e6fc47e6367c (diff)
drm/i915: Disable MI_SET_CONTEXT psmi w/a for bdw
The current w/a for the gen7 psmi related hangs doesn't apply to bdw, so disable it if using bdw ringbuffer submission. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/20170324151724.32640-1-chris@chris-wilson.co.uk Reviewed-by: MichaƂ Winiarski <michal.winiarski@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_gem_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 8fc8b3d15a0f..8bd0c4966913 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -582,8 +582,8 @@ mi_set_context(struct drm_i915_gem_request *req, u32 flags)
struct intel_engine_cs *engine = req->engine;
enum intel_engine_id id;
const int num_rings =
- /* Use an extended w/a on ivb+ if signalling from other rings */
- i915.semaphores ?
+ /* Use an extended w/a on gen7 if signalling from other rings */
+ (i915.semaphores && INTEL_GEN(dev_priv) == 7) ?
INTEL_INFO(dev_priv)->num_rings - 1 :
0;
int len;