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

Commit d846325a authored by Michał Winiarski's avatar Michał Winiarski Committed by Chris Wilson
Browse files

drm/i915/icl: Default to Thread Group preemption for compute workloads 



We assumed that the default preemption granularity is fine for ICL.
Unfortunately, it turns out that some drivers don't support mid-thread
preemption for compute workloads.
If a workload that doesn't support mid-thread preemption gets mid-thread
preempted, we're going to observe a GPU hang.
While I'm here, let's also update the "workaround" naming.

Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Cc: Anuj Phogat <anuj.phogat@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Rafael Antognolli <rafael.antognolli@intel.com>
Tested-by: default avatarAnuj Phogat <anuj.phogat@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarRafael Antognolli <rafael.antognolli@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190305124827.23446-1-michal.winiarski@intel.com
parent cf4331dd

drivers/gpu/drm/i915/intel_workarounds.c

+7 −2
Original line number Diff line number Diff line
@@ -555,6 +555,11 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine) 
			   GEN10_CACHE_MODE_SS,

			   0, /* write-only, so skip validation */

			   _MASKED_BIT_ENABLE(FLOAT_BLEND_OPTIMIZATION_ENABLE));



	/* WaDisableGPGPUMidThreadPreemption:icl */

	WA_SET_FIELD_MASKED(GEN8_CS_CHICKEN1,

			    GEN9_PREEMPT_GPGPU_LEVEL_MASK,

			    GEN9_PREEMPT_GPGPU_THREAD_GROUP_LEVEL);

}



void intel_engine_init_ctx_wa(struct intel_engine_cs *engine)
@@ -1162,8 +1167,8 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) 
				    GEN7_DISABLE_SAMPLER_PREFETCH);

	}



	if (IS_GEN(i915, 9) || IS_CANNONLAKE(i915)) {

		/* WaEnablePreemptionGranularityControlByUMD:skl,bxt,kbl,cfl,cnl */

	if (IS_GEN_RANGE(i915, 9, 11)) {

		/* FtrPerCtxtPreemptionGranularityControl:skl,bxt,kbl,cfl,cnl,icl */

		wa_masked_en(wal,

			     GEN7_FF_SLICE_CS_CHICKEN1,

			     GEN9_FFSC_PERCTX_PREEMPT_CTRL);