Commit ec72d588 authored by Michel Thierry's avatar Michel Thierry Committed by Daniel Vetter

drm/i915: WaEnableForceRestoreInCtxtDescForVCS is for video engines only

Also check for correct revision id in each Gen9 platform (SKL until B0
and BXT until A0).

Cc: Nick Hoath <nicholas.hoath@intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Tested-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6764e9f8
...@@ -301,10 +301,10 @@ uint64_t intel_lr_context_descriptor(struct intel_context *ctx, ...@@ -301,10 +301,10 @@ uint64_t intel_lr_context_descriptor(struct intel_context *ctx,
/* desc |= GEN8_CTX_FORCE_RESTORE; */ /* desc |= GEN8_CTX_FORCE_RESTORE; */
/* WaEnableForceRestoreInCtxtDescForVCS:skl */ /* WaEnableForceRestoreInCtxtDescForVCS:skl */
if (IS_GEN9(dev) && /* WaEnableForceRestoreInCtxtDescForVCS:bxt */
INTEL_REVID(dev) <= SKL_REVID_B0 && if (((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
(ring->id == BCS || ring->id == VCS || (IS_BROXTON(dev) && INTEL_REVID(dev) == BXT_REVID_A0)) &&
ring->id == VECS || ring->id == VCS2)) (ring->id == VCS || ring->id == VCS2))
desc |= GEN8_CTX_FORCE_RESTORE; desc |= GEN8_CTX_FORCE_RESTORE;
return desc; return desc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment