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

Commit f15f6ca1 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Daniel Vetter
Browse files

drm/i915/gen9: Add WaInPlaceDecompressionHang 



Add this workaround to prevent hang when in place compression
is used.

References: HSD#2135774
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
(cherry picked from commit 4ba9c1f7)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c5f87f02

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -2746,6 +2746,8 @@ struct drm_i915_cmd_table { 
#define SKL_REVID_D0		0x3

#define SKL_REVID_E0		0x4

#define SKL_REVID_F0		0x5

#define SKL_REVID_G0		0x6

#define SKL_REVID_H0		0x7



#define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))

drivers/gpu/drm/i915/i915_reg.h

+3 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,9 @@ enum skl_disp_power_wells { 


#define GEN7_TLB_RD_ADDR	_MMIO(0x4700)



#define GEN9_GAMT_ECO_REG_RW_IA _MMIO(0x4ab0)

#define   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS	(1<<18)



#define GAMT_CHKN_BIT_REG	_MMIO(0x4ab8)

#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING	(1<<28)

drivers/gpu/drm/i915/intel_ringbuffer.c

+14 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,11 @@ static int skl_init_workarounds(struct intel_engine_cs *engine) 
	/* WaDisableGafsUnitClkGating:skl */

	WA_SET_BIT(GEN7_UCGCTL4, GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);



	/* WaInPlaceDecompressionHang:skl */

	if (IS_SKL_REVID(dev_priv, SKL_REVID_H0, REVID_FOREVER))

		WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,

			   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);



	/* WaDisableLSQCROPERFforOCL:skl */

	ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);

	if (ret)
@@ -1178,6 +1183,11 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine) 
		WA_SET_BIT_MASKED(COMMON_SLICE_CHICKEN2,

				  GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION);



	/* WaInPlaceDecompressionHang:bxt */

	if (IS_BXT_REVID(dev_priv, BXT_REVID_C0, REVID_FOREVER))

		WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,

			   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);



	return 0;

}
@@ -1225,6 +1235,10 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine) 
		GEN7_HALF_SLICE_CHICKEN1,

		GEN7_SBE_SS_CACHE_DISPATCH_PORT_SHARING_DISABLE);



	/* WaInPlaceDecompressionHang:kbl */

	WA_SET_BIT(GEN9_GAMT_ECO_REG_RW_IA,

		   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS);



	/* WaDisableLSQCROPERFforOCL:kbl */

	ret = wa_ring_whitelist_reg(engine, GEN8_L3SQCREG4);

	if (ret)