drm/i915/cnl: apply Display WA #1178 to fix type C dongles
Subsystems (2)
PATCH 1/1 drm/i915/cnl: apply Display WA #1178 to fix type C dongles
Display WA #1178 is meant to fix Aux channel voltage swing too low with some type C dongles. Although it is for type C, HW engineers reported that it can be applied to all external ports even if they are not going to type C.
For CNL we apply the workaround every time Aux B, C and D are powering up since they will lose the configuration when powered down.
v2: Use common tag for WA
--- drivers/gpu/drm/i915/i915_reg.h | 11 +++++++++++ drivers/gpu/drm/i915/intel_runtime_pm.c | 9 +++++++++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +11 -0
@@ -8335,6 +8335,17 @@ enum skl_power_gate {#define SKL_PW_TO_PG (pw) ((pw) - SKL_DISP_PW_1 + SKL_PG1)#define SKL_FUSE_PG_DIST_STATUS (pg) (1 << (27 - (pg))) +#define _CNL_AUX_REG_IDX (pw) ((pw - 1) >> 4) +#define _CNL_AUX_ANAOVRD1_B 0x162250 +#define _CNL_AUX_ANAOVRD1_C 0x162210 +#define _CNL_AUX_ANAOVRD1_D 0x1622D0 +#define CNL_AUX_ANAOVRD1 (pw) _MMIO(_PICK(_CNL_AUX_REG_IDX(pw), \ + _CNL_AUX_ANAOVRD1_B, \ + _CNL_AUX_ANAOVRD1_C, \ + _CNL_AUX_ANAOVRD1_D)) +#define CNL_AUX_ANAOVRD1_ENABLE (1<<16) +#define CNL_AUX_ANAOVRD1_LDO_BYPASS (1<<23) +/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400#define _TRANS_DDI_FUNC_CTL_B 0x61400
drivers/gpu/drm/i915/intel_runtime_pm.c +9 -0
@@ -388,6 +388,15 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,I915_WRITE (HSW_PWR_WELL_CTL_DRIVER (id), val |HSW_PWR_WELL_CTL_REQ (id));hsw_wait_for_power_well_enable (dev_priv, power_well); +/* Display WA #1178: cnl */ +if (IS_CANNONLAKE (dev_priv) && + (id ==CNL_DISP_PW_AUX_B || id ==CNL_DISP_PW_AUX_C || + id ==CNL_DISP_PW_AUX_D )) { + val =I915_READ (CNL_AUX_ANAOVRD1 (id)); + val |=CNL_AUX_ANAOVRD1_ENABLE |CNL_AUX_ANAOVRD1_LDO_BYPASS ; +I915_WRITE (CNL_AUX_ANAOVRD1 (id), val); + } +if (wait_fuses)gen9_wait_for_power_well_fuses (dev_priv, pg);
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/cnl: apply Display WA #1178 to fix type C dongles
== Series Details ==
== Series Details ==
Series: drm/i915/cnl: apply Display WA #1178 to fix type C dongles
URL : https://patchwork.freedesktop.org/series/34566/
State : success
== Summary ==
Series 34566v1 drm/i915/cnl: apply Display WA #1178 to fix type C dongles
https://patchwork.freedesktop.org/api/1.0/series/34566/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:440s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:439s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:379s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:511s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:278s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:497s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:499s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:479s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:467s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:419s fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:266s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:533s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:369s fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:256s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:425s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:481s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:479s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:527s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:473s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:527s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:596s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:447s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:538s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:563s fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:513s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:498s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:448s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:416s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:607s fi-cnl-y total:272 pass:245 dwarn:0 dfail:0 fail:0 skip:26 fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:498s
5144438448829ec2a3d94fd16a9e69a52cfa7b3b drm-tip: 2017y-11m-28d-17h-04m-56s UTC integration manifest a0ec9ac8817a drm/i915/cnl: apply Display WA #1178 to fix type C dongles
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7331/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/cnl: apply Display WA #1178 to fix type C dongles
In reply to Lucas De Marchi== Series Details ==
== Series Details ==
Series: drm/i915/cnl: apply Display WA #1178 to fix type C dongles
URL : https://patchwork.freedesktop.org/series/34566/
State : success
== Summary ==
Blacklisted hosts:
shard-apl total:2458 pass:1522 dwarn:23 dfail:16 fail:13 skip:877 time:11304s shard-hsw total:2635 pass:1512 dwarn:9 dfail:0 fail:10 skip:1103 time:8851s shard-kbl total:2394 pass:1584 dwarn:24 dfail:10 fail:16 skip:754 time:8972s shard-snb total:2575 pass:1252 dwarn:16 dfail:4 fail:6 skip:1294 time:7719s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7331/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Lucas De Marchi
Display WA #1178 is meant to fix Aux channel voltage swing too low with some type C dongles. Although it is for type C, HW engineers reported that it can be applied to all external ports even if they are not going to type C.
For CNL we apply the workaround every time Aux B, C and D are powering up since they will lose the configuration when powered down.
Quoted 6 lines
v2: Use common tag for WA
Cc Rodrigo Vivi <[email protected]>Cc Arthur J Runyan <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>
we got all confirmations that we need. Thanks Art.
Quoted 54 lines
--- drivers/gpu/drm/i915/i915_reg.h | 11 +++++++++++ drivers/gpu/drm/i915/intel_runtime_pm.c | 9 +++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/i915/i915_reg.h +11
-0@@ -8335,6 +8335,17 @@ enum skl_power_gate {#define SKL_PW_TO_PG (pw) ((pw) - SKL_DISP_PW_1 + SKL_PG1)#define SKL_FUSE_PG_DIST_STATUS (pg) (1 << (27 - (pg))) +#define _CNL_AUX_REG_IDX (pw) ((pw - 1) >> 4) +#define _CNL_AUX_ANAOVRD1_B 0x162250 +#define _CNL_AUX_ANAOVRD1_C 0x162210 +#define _CNL_AUX_ANAOVRD1_D 0x1622D0 +#define CNL_AUX_ANAOVRD1 (pw) _MMIO(_PICK(_CNL_AUX_REG_IDX(pw), \ + _CNL_AUX_ANAOVRD1_B, \ + _CNL_AUX_ANAOVRD1_C, \ + _CNL_AUX_ANAOVRD1_D)) +#define CNL_AUX_ANAOVRD1_ENABLE (1<<16) +#define CNL_AUX_ANAOVRD1_LDO_BYPASS (1<<23) +/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400#define _TRANS_DDI_FUNC_CTL_B 0x61400drivers/gpu/drm/i915/intel_runtime_pm.c +9
-0@@ -388,6 +388,15 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,I915_WRITE (HSW_PWR_WELL_CTL_DRIVER (id), val |HSW_PWR_WELL_CTL_REQ (id));hsw_wait_for_power_well_enable (dev_priv, power_well); +/* Display WA #1178: cnl */ +if (IS_CANNONLAKE (dev_priv) && + (id ==CNL_DISP_PW_AUX_B || id ==CNL_DISP_PW_AUX_C || + id ==CNL_DISP_PW_AUX_D )) { + val =I915_READ (CNL_AUX_ANAOVRD1 (id)); + val |=CNL_AUX_ANAOVRD1_ENABLE |CNL_AUX_ANAOVRD1_LDO_BYPASS ; +I915_WRITE (CNL_AUX_ANAOVRD1 (id), val); + } +if (wait_fuses)gen9_wait_for_power_well_fuses (dev_priv, pg);Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 11 lines · Rodrigo Vivi
Quoted 10 lines · Lucas De Marchi
Display WA #1178 is meant to fix Aux channel voltage swing too low with some type C dongles. Although it is for type C, HW engineers reported that it can be applied to all external ports even if they are not going to type C.
For CNL we apply the workaround every time Aux B, C and D are powering up since they will lose the configuration when powered down.
v2: Use common tag for WA
Quoted 8 lines
Quoted 4 lines
Cc Rodrigo Vivi <[email protected]>Cc Arthur J Runyan <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>we got all confirmations that we need. Thanks Art.
Reviewed-by Rodrigo Vivi <[email protected]>
merged. Thanks for the patch.
Quoted 48 lines
Quoted 48 lines
--- drivers/gpu/drm/i915/i915_reg.h | 11 +++++++++++ drivers/gpu/drm/i915/intel_runtime_pm.c | 9 +++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/i915/i915_reg.h +11
-0@@ -8335,6 +8335,17 @@ enum skl_power_gate {#define SKL_PW_TO_PG (pw) ((pw) - SKL_DISP_PW_1 + SKL_PG1)#define SKL_FUSE_PG_DIST_STATUS (pg) (1 << (27 - (pg))) +#define _CNL_AUX_REG_IDX (pw) ((pw - 1) >> 4) +#define _CNL_AUX_ANAOVRD1_B 0x162250 +#define _CNL_AUX_ANAOVRD1_C 0x162210 +#define _CNL_AUX_ANAOVRD1_D 0x1622D0 +#define CNL_AUX_ANAOVRD1 (pw) _MMIO(_PICK(_CNL_AUX_REG_IDX(pw), \ + _CNL_AUX_ANAOVRD1_B, \ + _CNL_AUX_ANAOVRD1_C, \ + _CNL_AUX_ANAOVRD1_D)) +#define CNL_AUX_ANAOVRD1_ENABLE (1<<16) +#define CNL_AUX_ANAOVRD1_LDO_BYPASS (1<<23) +/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400#define _TRANS_DDI_FUNC_CTL_B 0x61400drivers/gpu/drm/i915/intel_runtime_pm.c +9
-0@@ -388,6 +388,15 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,I915_WRITE (HSW_PWR_WELL_CTL_DRIVER (id), val |HSW_PWR_WELL_CTL_REQ (id));hsw_wait_for_power_well_enable (dev_priv, power_well); +/* Display WA #1178: cnl */ +if (IS_CANNONLAKE (dev_priv) && + (id ==CNL_DISP_PW_AUX_B || id ==CNL_DISP_PW_AUX_C || + id ==CNL_DISP_PW_AUX_D )) { + val =I915_READ (CNL_AUX_ANAOVRD1 (id)); + val |=CNL_AUX_ANAOVRD1_ENABLE |CNL_AUX_ANAOVRD1_LDO_BYPASS ; +I915_WRITE (CNL_AUX_ANAOVRD1 (id), val); + } +if (wait_fuses)gen9_wait_for_power_well_fuses (dev_priv, pg);
Quoted 7 lines
Quoted 7 lines
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx