Skip to content

Commit 5665a1f

Browse files
mattropejlahtine-intel
authored andcommitted
drm/i915/tgl: Drop Wa#1178
The TGL workaround database no longer shows Wa raspberrypi#1178 (or anything similar under different workaround names/numbers) so we should be able to drop it. In fact Swati just discovered that applying this workaround is the root cause of some power well enable failures we've been seeing in CI (gitlab issue 498). Once we stop applying this WA, TGL no longer utilizes any of the special handling provided by icl_combo_phy_aux_power_well_ops so we can just drop back to using the standard hsw-style power well ops instead. v3: Drop now-unused _TGL_AUX_ANAOVRD1_C definition too. (Lucas) Closes: https://gitlab.freedesktop.org/drm/intel/issues/498 Fixes: deea06b ("drm/i915/tgl: apply Display WA raspberrypi#1178 to fix type C dongles") Cc: Lucas De Marchi <[email protected]> Cc: Swati Sharma <[email protected]> Cc: Imre Deak <[email protected]> Signed-off-by: Matt Roper <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit ab34025) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 2eeab8e commit 5665a1f

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

drivers/gpu/drm/i915/display/intel_display_power.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3977,7 +3977,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
39773977
{
39783978
.name = "AUX A",
39793979
.domains = TGL_AUX_A_IO_POWER_DOMAINS,
3980-
.ops = &icl_combo_phy_aux_power_well_ops,
3980+
.ops = &hsw_power_well_ops,
39813981
.id = DISP_PW_ID_NONE,
39823982
{
39833983
.hsw.regs = &icl_aux_power_well_regs,
@@ -3987,7 +3987,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
39873987
{
39883988
.name = "AUX B",
39893989
.domains = TGL_AUX_B_IO_POWER_DOMAINS,
3990-
.ops = &icl_combo_phy_aux_power_well_ops,
3990+
.ops = &hsw_power_well_ops,
39913991
.id = DISP_PW_ID_NONE,
39923992
{
39933993
.hsw.regs = &icl_aux_power_well_regs,
@@ -3997,7 +3997,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = {
39973997
{
39983998
.name = "AUX C",
39993999
.domains = TGL_AUX_C_IO_POWER_DOMAINS,
4000-
.ops = &icl_combo_phy_aux_power_well_ops,
4000+
.ops = &hsw_power_well_ops,
40014001
.id = DISP_PW_ID_NONE,
40024002
{
40034003
.hsw.regs = &icl_aux_power_well_regs,

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9405,11 +9405,9 @@ enum skl_power_gate {
94059405
#define _ICL_AUX_REG_IDX(pw_idx) ((pw_idx) - ICL_PW_CTL_IDX_AUX_A)
94069406
#define _ICL_AUX_ANAOVRD1_A 0x162398
94079407
#define _ICL_AUX_ANAOVRD1_B 0x6C398
9408-
#define _TGL_AUX_ANAOVRD1_C 0x160398
94099408
#define ICL_AUX_ANAOVRD1(pw_idx) _MMIO(_PICK(_ICL_AUX_REG_IDX(pw_idx), \
94109409
_ICL_AUX_ANAOVRD1_A, \
9411-
_ICL_AUX_ANAOVRD1_B, \
9412-
_TGL_AUX_ANAOVRD1_C))
9410+
_ICL_AUX_ANAOVRD1_B))
94139411
#define ICL_AUX_ANAOVRD1_LDO_BYPASS (1 << 7)
94149412
#define ICL_AUX_ANAOVRD1_ENABLE (1 << 0)
94159413

0 commit comments

Comments
 (0)