Skip to content

Commit 25b79ad

Browse files
mattropejlahtine-intel
authored andcommitted
drm/i915: Add Wa_1407352427:icl,ehl
The workaround database now indicates we need to disable psdunit clock gating as well. v3: - Rebase on top of other workarounds that have landed. - Restrict cc:stable tag to 5.2+ since that's when ICL was first officially supported. Bspec: 32354 Bspec: 33450 Bspec: 33451 Suggested-by: Lionel Landwerlin <[email protected]> Cc: [email protected] # v5.2+ Cc: Lionel Landwerlin <[email protected]> Cc: Lucas De Marchi <[email protected]> Cc: Matt Atwood <[email protected]> Signed-off-by: Matt Roper <[email protected]> Acked-by: Lionel Landwerlin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 1cd21a7) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent a7f3ad3 commit 25b79ad

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4181,6 +4181,10 @@ enum {
41814181
#define HSUNIT_CLKGATE_DIS REG_BIT(8)
41824182
#define VSUNIT_CLKGATE_DIS REG_BIT(3)
41834183

4184+
#define UNSLICE_UNIT_LEVEL_CLKGATE2 _MMIO(0x94e4)
4185+
#define VSUNIT_CLKGATE_DIS_TGL REG_BIT(19)
4186+
#define PSDUNIT_CLKGATE_DIS REG_BIT(5)
4187+
41844188
#define INF_UNIT_LEVEL_CLKGATE _MMIO(0x9560)
41854189
#define CGPSF_CLKGATE_DIS (1 << 3)
41864190

drivers/gpu/drm/i915/intel_pm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6573,6 +6573,9 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)
65736573
intel_uncore_rmw(&dev_priv->uncore, UNSLICE_UNIT_LEVEL_CLKGATE,
65746574
0, VSUNIT_CLKGATE_DIS | HSUNIT_CLKGATE_DIS);
65756575

6576+
/* Wa_1407352427:icl,ehl */
6577+
intel_uncore_rmw(&dev_priv->uncore, UNSLICE_UNIT_LEVEL_CLKGATE2,
6578+
0, PSDUNIT_CLKGATE_DIS);
65766579
}
65776580

65786581
static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)

0 commit comments

Comments
 (0)