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 <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Michał Winiarski <[email protected]>

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 8fc8b3d15a0f8771acba66f7e165af3b699612c0..8bd0c4966913f55078b3069bca6c4edb4bd4e48b 100644 (file)
--- 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;