drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
"CNL PCH chance of hang when software accesses south display registers after hotplug is enabled.
Workaround: Program 0xC2000 bits 11:8 = 0xF before enabling south display hotplug detection."
"Workaround only needs to be applied to pre-production steppings used in graphics capable SKUs, but it is easier to apply to everything, and does not hurt."
v2: Moving from clock gating to right before enabling
SHOTPLUG_CTL as it should be.
v3: Align with SOUTH_CHICKEN1 (DK) and consequently use proper
spaces on bits definition since other bits around already use new style. And now that checkpatch is not noise anymore I also fixed the reg read mask to avoid going over 80 chars.
--- drivers/gpu/drm/i915/i915_irq.c | 10 +++++++++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +9 -1
@@ -3218,7 +3218,15 @@ static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)static void spt_hpd_detection_setup (struct drm_i915_private *dev_priv) { -u32 hotplug; +u32 val, hotplug; + +/* Display WA #1179 WaHardHangonHotPlug: cnp */ +if (HAS_PCH_CNP (dev_priv)) { + val =I915_READ (SOUTH_CHICKEN1 ); + val &= ~CHASSIS_CLK_REQ_DURATION_MASK ; + val |=CHASSIS_CLK_REQ_DURATION (0xf ); +I915_WRITE (SOUTH_CHICKEN1 , val); + }/* Enable digital hotplug on the PCH */ hotplug =I915_READ (PCH_PORT_HOTPLUG );
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -7471,6 +7471,8 @@ enum {#define FDI_PHASE_SYNC_OVR (pipe) (1<<(FDIA_PHASE_SYNC_SHIFT_OVR - ((pipe) * 2)))#define FDI_PHASE_SYNC_EN (pipe) (1<<(FDIA_PHASE_SYNC_SHIFT_EN - ((pipe) * 2)))#define FDI_BC_BIFURCATION_SELECT (1 << 12) +#define CHASSIS_CLK_REQ_DURATION_MASK (0xf << 8) +#define CHASSIS_CLK_REQ_DURATION (x) ((x) << 8)#define SPT_PWM_GRANULARITY (1<<0)#define SOUTH_CHICKEN2 _MMIO(0xc2004)#define FDI_MPHY_IOSFSB_RESET_STATUS (1<<13)
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
== Series Details ==
== Series Details ==
Series: drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
URL : https://patchwork.freedesktop.org/series/30626/
State : success
== Summary ==
Series 30626v1 drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
https://patchwork.freedesktop.org/api/1.0/series/30626/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Test kms_frontbuffer_tracking:
Subgroup basic:
dmesg-warn -> PASS (fi-kbl-7500u)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-b:
incomplete -> DMESG-WARN (fi-cfl-s) fdo#102294
Subgroup suspend-read-crc-pipe-a:
incomplete -> PASS (fi-kbl-7500u)
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-WARN (fi-glk-1) fdo#102777fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:440s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:469s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:419s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:510s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:277s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:496s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:496s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:494s fi-cfl-s total:289 pass:222 dwarn:35 dfail:0 fail:0 skip:32 time:539s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:421s fi-glk-1 total:289 pass:259 dwarn:1 dfail:0 fail:0 skip:29 time:561s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:423s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:407s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:431s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:493s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:464s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:467s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:574s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:586s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:542s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:448s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:747s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:487s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:474s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:567s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:418s
bf6ecf6d25c1c45e576643b7d7a65e8b1e6b4f01 drm-tip: 2017y-09m-19d-17h-23m-04s UTC integration manifest a7e5944e9f01 drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5759/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Rodrigo Vivi
"CNL PCH chance of hang when software accesses south display registers after hotplug is enabled.
Workaround: Program0xC2000bits 11:8 =0xFbefore enabling south display hotplug detection.""Workaround only needs to be applied to pre-production steppings used in graphics capable SKUs, but it is easier to apply to everything, and does not hurt."
v2: Moving from clock gating to right before enabling
SHOTPLUG_CTLas it should be.
v3: Align withSOUTH_CHICKEN1(DK) and consequently use proper
spaces on bits definition since other bits around already use new style. And now that checkpatch is not noise anymore I also fixed the reg read mask to avoid going over 80 chars.
Quoted 5 lines
Suggested-by Ben Widawsky <[email protected]>Cc Ben Widawsky <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Reviewed-by Dhinakaran Pandiyan <[email protected]>
merged to dinq. thanks for the review
Quoted 42 lines
--- drivers/gpu/drm/i915/i915_irq.c | 10 +++++++++- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +9
-1@@ -3218,7 +3218,15 @@ static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)static void spt_hpd_detection_setup (struct drm_i915_private *dev_priv) { -u32 hotplug; +u32 val, hotplug; + +/* Display WA #1179 WaHardHangonHotPlug: cnp */ +if (HAS_PCH_CNP (dev_priv)) { + val =I915_READ (SOUTH_CHICKEN1 ); + val &= ~CHASSIS_CLK_REQ_DURATION_MASK ; + val |=CHASSIS_CLK_REQ_DURATION (0xf ); +I915_WRITE (SOUTH_CHICKEN1 , val); + }/* Enable digital hotplug on the PCH */ hotplug =I915_READ (PCH_PORT_HOTPLUG );drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -7471,6 +7471,8 @@ enum {#define FDI_PHASE_SYNC_OVR (pipe) (1<<(FDIA_PHASE_SYNC_SHIFT_OVR - ((pipe) * 2)))#define FDI_PHASE_SYNC_EN (pipe) (1<<(FDIA_PHASE_SYNC_SHIFT_EN - ((pipe) * 2)))#define FDI_BC_BIFURCATION_SELECT (1 << 12) +#define CHASSIS_CLK_REQ_DURATION_MASK (0xf << 8) +#define CHASSIS_CLK_REQ_DURATION (x) ((x) << 8)#define SPT_PWM_GRANULARITY (1<<0)#define SOUTH_CHICKEN2 _MMIO(0xc2004)#define FDI_MPHY_IOSFSB_RESET_STATUS (1<<13)Signature · 1 line
2.13.5
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: drm/i915/cnp: Display Wa #1179: WaHardHangonHotPlug
URL : https://patchwork.freedesktop.org/series/30626/
State : warning
== Summary ==
Test kms_flip:
Subgroup rcs-wf_vblank-vs-dpms:
dmesg-warn -> PASS (shard-hsw)
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252 +1
Test kms_atomic:
Subgroup plane_primary_legacy:
pass -> SKIP (shard-hsw)fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2317 pass:1244 dwarn:3 dfail:0 fail:12 skip:1058 time:9504s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5759/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx