drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
Subsystems (2)
PATCH v2 1/2 drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
Rename DP_AUX_CH_CTL_TIME_OUT_1600us to DP_AUX_CH_CTL_TIME_OUT_MAX, as the meaning of the (3 << 26) value varies per platform, but it's always the maximum timeout for that platform. Pre-CNL it means 1600us, and for CNL it means 3200us.
v2:
-Split in to two patches (Rodrigo)
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -5242,7 +5242,7 @@ enum {#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26) -#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26) +#define DP_AUX_CH_CTL_TIME_OUT_MAX (3 << 26)/* Varies per platform */ #define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1032,7 +1032,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE | (has_aux_irq ?DP_AUX_CH_CTL_INTERRUPT :0 ) |DP_AUX_CH_CTL_TIME_OUT_ERROR | - DP_AUX_CH_CTL_TIME_OUT_1600us | +DP_AUX_CH_CTL_TIME_OUT_MAX |DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Per BSpec, 400us is "BDW+ Do not use this setting." - not just PORT_A. Set BDW to 600us unconditionally.
v2:
-Split in to two patches (Rodrigo)
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1007,7 +1007,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us;
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/2] drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting
Quoted 9 lines · James Ausmus
Per BSpec, 400us is "BDW+ Do not use this setting." - not just
PORT_A. Set BDW to 600us unconditionally.v2:
-Split in to two patches (Rodrigo)Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by James Ausmus <[email protected]>
same
Quoted 20 lines
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1007,7 +1007,7 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,else precharge =5 ; -if (IS_BROADWELL (dev_priv) && intel_dig_port->port ==PORT_A ) +if (IS_BROADWELL (dev_priv)) timeout = DP_AUX_CH_CTL_TIME_OUT_600us;else timeout = DP_AUX_CH_CTL_TIME_OUT_400us;Signature · 1 line
2.14.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · James Ausmus
Rename
DP_AUX_CH_CTL_TIME_OUT_1600ustoDP_AUX_CH_CTL_TIME_OUT_MAX, as the meaning of the (3 << 26) value varies per platform, but it's always the maximum timeout for that platform. Pre-CNL it means 1600us, and for CNL it means 3200us.v2:
-Split in to two patches (Rodrigo)Cc Rodrigo Vivi <[email protected]>Signed-off-by James Ausmus <[email protected]>
you could've added the rv-b already: ;)
Quoted 34 lines
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -5242,7 +5242,7 @@ enum {#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26) -#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26) +#define DP_AUX_CH_CTL_TIME_OUT_MAX (3 << 26)/* Varies per platform */ #define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1032,7 +1032,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE | (has_aux_irq ?DP_AUX_CH_CTL_INTERRUPT :0 ) |DP_AUX_CH_CTL_TIME_OUT_ERROR | - DP_AUX_CH_CTL_TIME_OUT_1600us | +DP_AUX_CH_CTL_TIME_OUT_MAX |DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |Signature · 1 line
2.14.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 9 lines · Rodrigo Vivi
Quoted 8 lines · James Ausmus
Rename
DP_AUX_CH_CTL_TIME_OUT_1600ustoDP_AUX_CH_CTL_TIME_OUT_MAX, as the meaning of the (3 << 26) value varies per platform, but it's always the maximum timeout for that platform. Pre-CNL it means 1600us, and for CNL it means 3200us.v2:
-Split in to two patches (Rodrigo)
Quoted 6 lines
Quoted 2 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by James Ausmus <[email protected]>you could've added the rv-b already: ;)
Reviewed-by Rodrigo Vivi <[email protected]>
Pushed both as the CI results arrived in my time zone, thanks for the patches and review.
BR,
Jani.
Quoted 35 lines
Quoted 35 lines
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_reg.h +1
-1@@ -5242,7 +5242,7 @@ enum {#define DP_AUX_CH_CTL_TIME_OUT_400us (0 << 26)#define DP_AUX_CH_CTL_TIME_OUT_600us (1 << 26)#define DP_AUX_CH_CTL_TIME_OUT_800us (2 << 26) -#define DP_AUX_CH_CTL_TIME_OUT_1600us (3 << 26) +#define DP_AUX_CH_CTL_TIME_OUT_MAX (3 << 26)/* Varies per platform */ #define DP_AUX_CH_CTL_TIME_OUT_MASK (3 << 26)#define DP_AUX_CH_CTL_RECEIVE_ERROR (1 << 25)#define DP_AUX_CH_CTL_MESSAGE_SIZE_MASK (0x1f << 20)drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1032,7 +1032,7 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_DONE | (has_aux_irq ?DP_AUX_CH_CTL_INTERRUPT :0 ) |DP_AUX_CH_CTL_TIME_OUT_ERROR | - DP_AUX_CH_CTL_TIME_OUT_1600us | +DP_AUX_CH_CTL_TIME_OUT_MAX |DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ) | DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |Signature · 1 line
2.14.1
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
In reply to James Ausmus== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
URL : https://patchwork.freedesktop.org/series/31856/
State : success
== Summary ==
Series 31856v1 series starting with [v2,1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
https://patchwork.freedesktop.org/api/1.0/series/31856/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-byt-j1900) fdo#101705fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:461s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:470s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:396s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:580s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:287s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:527s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:528s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:539s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:528s fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:562s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:438s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:275s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:607s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:438s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:463s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:502s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:481s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:505s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:487s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:597s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:666s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:535s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:512s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:480s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:589s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:434s
fi-pnv-d510 failed to connect after reboot
490bd134d63554815d2ea6ff56e6d32fd50ff472 drm-tip: 2017y-10m-12d-20h-08m-10s UTC integration manifest 6337cc32a524 drm/i915/bdw: Fix DP_AUX_CH_CTL_TIME_OUT setting84096eab1ae4 drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6016/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v2,1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
In reply to James Ausmus== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Fix DP_AUX_CH_CTL_TIME_OUT naming
URL : https://patchwork.freedesktop.org/series/31856/
State : success
== Summary ==
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2552 pass:1439 dwarn:0 dfail:0 fail:10 skip:1103 time:9610s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6016/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx