Commit 233bee7e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-12-09' of... 

Merge tag 'drm-intel-fixes-2021-12-09' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

A fix to a error pointer dereference in gem_execbuffer and
a fix for GT initialization when GuC/HuC are used on ICL.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YbJVWYAd/jeERCYY@intel.com
parents 2eb557d2 52255ef6

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+1 −0
Original line number Diff line number Diff line
@@ -3277,6 +3277,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 
	out_fence = eb_requests_create(&eb, in_fence, out_fence_fd);

	if (IS_ERR(out_fence)) {

		err = PTR_ERR(out_fence);

		out_fence = NULL;

		if (eb.requests[0])

			goto err_request;

		else

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

+9 −9
Original line number Diff line number Diff line
@@ -1127,6 +1127,15 @@ icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) 
		    GAMT_CHKN_BIT_REG,

		    GAMT_CHKN_DISABLE_L3_COH_PIPE);



	/* Wa_1407352427:icl,ehl */

	wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2,

		    PSDUNIT_CLKGATE_DIS);



	/* Wa_1406680159:icl,ehl */

	wa_write_or(wal,

		    SUBSLICE_UNIT_LEVEL_CLKGATE,

		    GWUNIT_CLKGATE_DIS);



	/* Wa_1607087056:icl,ehl,jsl */

	if (IS_ICELAKE(i915) ||

	    IS_JSL_EHL_GT_STEP(i915, STEP_A0, STEP_B0))
@@ -1852,15 +1861,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) 
		wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE,

			    VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS);



		/* Wa_1407352427:icl,ehl */

		wa_write_or(wal, UNSLICE_UNIT_LEVEL_CLKGATE2,

			    PSDUNIT_CLKGATE_DIS);



		/* Wa_1406680159:icl,ehl */

		wa_write_or(wal,

			    SUBSLICE_UNIT_LEVEL_CLKGATE,

			    GWUNIT_CLKGATE_DIS);



		/*

		 * Wa_1408767742:icl[a2..forever],ehl[all]

		 * Wa_1605460711:icl[a0..c0]