Commit afa351a1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-intel-next-fixes-2023-04-13' of... 

Merge tag 'drm-intel-next-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

Just one Cc:stable fix for sampler indirect state in bindless heap.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZDfxo+PXyw9ivFLI@jlahtine-mobl.ger.corp.intel.com
parents d8dab40a 81900e3a

drivers/gpu/drm/i915/gt/intel_gt_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -1145,6 +1145,7 @@ 
#define   SC_DISABLE_POWER_OPTIMIZATION_EBB	REG_BIT(9)

#define   GEN11_SAMPLER_ENABLE_HEADLESS_MSG	REG_BIT(5)

#define   MTL_DISABLE_SAMPLER_SC_OOO		REG_BIT(3)

#define   GEN11_INDIRECT_STATE_BASE_ADDR_OVERRIDE	REG_BIT(0)



#define GEN9_HALF_SLICE_CHICKEN7		MCR_REG(0xe194)

#define   DG2_DISABLE_ROUND_ENABLE_ALLOW_FOR_SSLA	REG_BIT(15)

drivers/gpu/drm/i915/gt/intel_workarounds.c

+19 −0
Original line number Diff line number Diff line
@@ -2971,6 +2971,25 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li 


	add_render_compute_tuning_settings(i915, wal);



	if (GRAPHICS_VER(i915) >= 11) {

		/* This is not a Wa (although referred to as

		 * WaSetInidrectStateOverride in places), this allows

		 * applications that reference sampler states through

		 * the BindlessSamplerStateBaseAddress to have their

		 * border color relative to DynamicStateBaseAddress

		 * rather than BindlessSamplerStateBaseAddress.

		 *

		 * Otherwise SAMPLER_STATE border colors have to be

		 * copied in multiple heaps (DynamicStateBaseAddress &

		 * BindlessSamplerStateBaseAddress)

		 *

		 * BSpec: 46052

		 */

		wa_mcr_masked_en(wal,

				 GEN10_SAMPLER_MODE,

				 GEN11_INDIRECT_STATE_BASE_ADDR_OVERRIDE);

	}



	if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_B0, STEP_FOREVER) ||

	    IS_MTL_GRAPHICS_STEP(i915, P, STEP_B0, STEP_FOREVER))

		/* Wa_14017856879 */