iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: WaEnableForceRestoreInCtxtDescForVCS is for video engines only

Browse Source 
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: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Tested-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Michel Thierry 2015-09-04 12:59:14 +01:00 committed by Daniel Vetter
parent 6764e9f872
commit ec72d5884c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_lrc.c
View File

@ -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;