Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/i915/intel_lrc.c

+4 −4
Original line number Diff line number Diff line
@@ -301,10 +301,10 @@ uint64_t intel_lr_context_descriptor(struct intel_context *ctx, 
	/* desc |= GEN8_CTX_FORCE_RESTORE; */



	/* WaEnableForceRestoreInCtxtDescForVCS:skl */

	if (IS_GEN9(dev) &&

	    INTEL_REVID(dev) <= SKL_REVID_B0 &&

	    (ring->id == BCS || ring->id == VCS ||

	    ring->id == VECS || ring->id == VCS2))

	/* WaEnableForceRestoreInCtxtDescForVCS:bxt */

	if (((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||

	     (IS_BROXTON(dev) && INTEL_REVID(dev) == BXT_REVID_A0)) &&

	    (ring->id == VCS || ring->id == VCS2))

		desc |= GEN8_CTX_FORCE_RESTORE;



	return desc;