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

Commit 60294683 authored by Arun Siluvery's avatar Arun Siluvery Committed by Daniel Vetter
Browse files

drm/i915/gen9: Merge two WA as they part of same register 



Merge Wa4x4STCOptimizationDisable and WaDisablePartialResolveInVc to save
an entry in WA array.

Signed-off-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent aa0011a8

drivers/gpu/drm/i915/intel_ringbuffer.c

+2 −3
Original line number Diff line number Diff line
@@ -961,10 +961,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) 
	}



	/* Wa4x4STCOptimizationDisable:skl,bxt */

	WA_SET_BIT_MASKED(CACHE_MODE_1, GEN8_4x4_STC_OPTIMIZATION_DISABLE);



	/* WaDisablePartialResolveInVc:skl,bxt */

	WA_SET_BIT_MASKED(CACHE_MODE_1, GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE);

	WA_SET_BIT_MASKED(CACHE_MODE_1, (GEN8_4x4_STC_OPTIMIZATION_DISABLE |

					 GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE));



	/* WaCcsTlbPrefetchDisable:skl,bxt */

	WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,