FAILED: patch "[PATCH] drm/i915/gen9: Add WaInPlaceDecompressionHang" failed to apply to 4.8-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.8-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
4ba9c1f7c7b8ca8c1d77f65d408e589dc87b9a2dMon Sep 17 00:00:00 2001
From: Mika Kuoppala <[email protected]>
Date: Wed, 20 Jul 2016 14:26:12 +0300
Subject: [PATCH] drm/i915/gen9: Add WaInPlaceDecompressionHang
Add this workaround to prevent hang when in place compression is used.
References: HSD#2135774
Signed-off-by Mika Kuoppala <[email protected]>
Reviewed-by Arun Siluvery <[email protected]>
Signed-off-by Joonas Lahtinen <[email protected]>
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2629,6 +2629,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
@@ -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
@@ -1104,6 +1104,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)
@@ -1173,6 +1178,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 ; }
@@ -1220,6 +1230,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)