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

Commit 65ca7514 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915/skl: Implement WaBarrierPerformanceFixDisable 



Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarNick Hoath <nicholas.hoath@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e2db7071

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -5272,6 +5272,7 @@ enum skl_disp_power_wells { 
#define  HDC_DONOT_FETCH_MEM_WHEN_MASKED	(1<<11)

#define  HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT	(1<<5)

#define  HDC_FORCE_NON_COHERENT			(1<<4)

#define  HDC_BARRIER_PERFORMANCE_DISABLE	(1<<10)



/* WaCatErrorRejectionIssue */

#define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG		0x9030

drivers/gpu/drm/i915/intel_ringbuffer.c

+7 −0
Original line number Diff line number Diff line
@@ -934,6 +934,13 @@ static int chv_init_workarounds(struct intel_engine_cs *ring) 
			    GEN6_WIZ_HASHING_MASK,

			    GEN6_WIZ_HASHING_16x4);



	if (INTEL_REVID(dev) == SKL_REVID_C0 ||

	    INTEL_REVID(dev) == SKL_REVID_D0)

		/* WaBarrierPerformanceFixDisable:skl */

		WA_SET_BIT_MASKED(HDC_CHICKEN0,

				  HDC_FENCE_DEST_SLM_DISABLE |

				  HDC_BARRIER_PERFORMANCE_DISABLE);



	return 0;

}