drm: Add retries for dp dual mode read
Subsystems (3)
PATCH v3 1/2 drm: Add retries for dp dual mode read
From the CI builds, its been observed that during a driver reload/insert, dp dual mode read function sometimes fails to read from dual mode devices (like LSPCON) over i2c-over-aux channel.
This patch:
- adds some delay and few retries, allowing a scope for these devices to settle down and respond.
- changes one error log's level from ERROR->DEBUG as we want to call it an error only after all the retries are exhausted.
V2: Addressed review comments from Jani (for loop for retry)
V3: Addressed review comments from Imre (break on partial read too)
--- drivers/gpu/drm/drm_dp_dual_mode_helper.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_dp_dual_mode_helper.c +10 -2
@@ -75,8 +75,16 @@ ssize_t drm_dp_dual_mode_read(struct i2c_adapter *adapter, }, };int ret; +int retry; + +for (retry =0 ; retry <6 ; retry++) { +if (retry) +usleep_range (500 ,1000 ); + ret =i2c_transfer (adapter, msgs,ARRAY_SIZE (msgs)); +if (ret >=0 ) +break ; + } - ret =i2c_transfer (adapter, msgs,ARRAY_SIZE (msgs));if (ret <0 )return ret;if (ret !=ARRAY_SIZE (msgs))
@@ -420,7 +428,7 @@ int drm_lspcon_get_mode(struct i2c_adapter *adapter, ret =drm_dp_dual_mode_read (adapter,DP_DUAL_MODE_LSPCON_CURRENT_MODE , &data,sizeof (data));if (ret <0 ) { -DRM_ERROR ("LSPCON read(0x80, 0x41) failed\n" ); +DRM_DEBUG_KMS ("LSPCON read(0x80, 0x41) failed\n" );return -EFAULT ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/2 drm/i915: Don't give up waiting on INVALID_MODE
Our current logic to read LSPCON's current mode, stops retries and breaks wait-loop, if it gets LSPCON_MODE_INVALID as return from the core function. This doesn't allow us to try reading the mode again.
This patch removes this condition and allows retries reading the currnt mode until timeout.
This also fixes/prevents some of the noise in form of debug messages while running IGT CI test cases.
V2: rebase, added r-b
V2: changed some debug message levels from debug->error and
error->debug in lspcon_get_current_mode function.
--- drivers/gpu/drm/i915/intel_lspcon.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_lspcon.c +4 -5
@@ -56,7 +56,7 @@ static enum drm_lspcon_mode lspcon_get_current_mode(struct intel_lspcon *lspcon)struct i2c_adapter *adapter = &lspcon_to_intel_dp (lspcon)->aux.ddc;if (drm_lspcon_get_mode (adapter, ¤t_mode)) { -DRM_ERROR ("Error reading LSPCON mode\n" ); +DRM_DEBUG_KMS ("Error reading LSPCON mode\n" );return DRM_LSPCON_MODE_INVALID ; }return current_mode;
@@ -68,16 +68,15 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,enum drm_lspcon_mode current_mode; current_mode =lspcon_get_current_mode (lspcon); -if (current_mode == mode || current_mode ==DRM_LSPCON_MODE_INVALID ) +if (current_mode == mode) goto out;DRM_DEBUG_KMS ("Waiting for LSPCON mode %s to settle\n" ,lspcon_mode_name (mode)); -wait_for ((current_mode =lspcon_get_current_mode (lspcon)) == mode || - current_mode ==DRM_LSPCON_MODE_INVALID ,100 ); +wait_for ((current_mode =lspcon_get_current_mode (lspcon)) == mode,100 );if (current_mode != mode) -DRM_DEBUG_KMS ("LSPCON mode hasn't settled\n" ); +DRM_ERROR ("LSPCON mode hasn't settled\n" ); out: DRM_DEBUG_KMS("Current LSPCON mode %s\n",
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [REBASE,v3,1/2] drm: Add retries for dp dual mode read
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: series starting with [REBASE,v3,1/2] drm: Add retries for dp dual mode read
URL : https://patchwork.freedesktop.org/series/31320/
State : success
== Summary ==
Series 31320v1 series starting with [REBASE,v3,1/2] drm: Add retries for dp dual mode read
https://patchwork.freedesktop.org/api/1.0/series/31320/revisions/1/mbox/
Test chamelium:
Subgroup dp-edid-read:
pass -> FAIL (fi-kbl-7500u) fdo#102672
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7567u) fdo#102294 +3fdo#102672 https://bugs.freedesktop.org/show_bug.cgi?id=102672
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:466s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:475s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:399s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:584s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:290s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:536s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:534s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:550s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:541s fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:637s fi-cnl-y total:289 pass:261 dwarn:1 dfail:0 fail:0 skip:27 time:641s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:445s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:598s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:445s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:422s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:478s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:557s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:480s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:511s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:590s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:519s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:614s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:653s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:479s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:544s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:526s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:482s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:599s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:437s
79f82050a2456244c7a511905075bb3b50d30b5e drm-tip: 2017y-10m-03d-11h-31m-30s UTC integration manifest f60391905806 drm/i915: Don't give up waiting on INVALID_MODEfeeb30469a21 drm: Add retries for dp dual mode read
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5879/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [REBASE,v3,1/2] drm: Add retries for dp dual mode read
In reply to Shashank Sharma== Series Details ==
== Series Details ==
Series: series starting with [REBASE,v3,1/2] drm: Add retries for dp dual mode read
URL : https://patchwork.freedesktop.org/series/31320/
State : success
== Summary ==
Test kms_flip:
Subgroup plain-flip-ts-check-interruptible:
fail -> PASS (shard-hsw)
Test kms_sysfs_edid_timing:
pass -> WARN (shard-hsw) fdo#100047
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2429 pass:1329 dwarn:7 dfail:0 fail:9 skip:1083 time:10294s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5879/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 45 lines · Shashank Sharma
From the CI builds, its been observed that during a driver reload/insert, dp dual mode read function sometimes fails to read from dual mode devices (like LSPCON) over i2c-over-aux channel.
This patch:
- adds some delay and few retries, allowing a scope for these devices to settle down and respond.
- changes one error log's level fromERROR->DEBUGas we want to call it an error only after all the retries are exhausted.V2: Addressed review comments from Jani (for loop for retry)
V3: Addressed review comments from Imre (break on partial read too)Cc Ville Syrjala <[email protected]>Cc Imre Deak <[email protected]>Cc Jani Nikula <[email protected]>Signed-off-by Shashank Sharma <[email protected]>--- drivers/gpu/drm/drm_dp_dual_mode_helper.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_dp_dual_mode_helper.c +9
-1@@ -75,8 +75,16 @@ ssize_t drm_dp_dual_mode_read(struct i2c_adapter *adapter, }, };int ret; +int retry; + +for (retry =0 ; retry <6 ; retry++) { +if (retry) +usleep_range (500 ,1000 ); + ret =i2c_transfer (adapter, msgs,ARRAY_SIZE (msgs)); +if (ret >=0 ) +break ; + } - ret =i2c_transfer (adapter, msgs,ARRAY_SIZE (msgs));if (ret <0 )return ret;if (ret !=ARRAY_SIZE (msgs))
drivers/gpu/drm/drm_dp_dual_mode_helper.c int drm_lspcon_get_mode(struct i2c_adapter *adapter, · line 433
Quoted 7 lines
drivers/gpu/drm/drm_dp_dual_mode_helper.c +1
-1@@ -420,7 +428,7 @@ int drm_lspcon_get_mode(struct i2c_adapter *adapter, ret =drm_dp_dual_mode_read (adapter,DP_DUAL_MODE_LSPCON_CURRENT_MODE , &data,sizeof (data));if (ret <0 ) { -DRM_ERROR ("LSPCON read(0x80, 0x41) failed\n" ); +DRM_DEBUG_KMS ("LSPCON read(0x80, 0x41) failed\n" );return -EFAULT ; }
Ville's comment about the penalty for well working adapters still holds. Also I don't think we should care about possibly faulty external adapters until we see one.
So this probably means moving the retry to drm_lspcon_get_mode() and lspcon_probe().
--Imre
Quoted 4 lines
Signature · 2 lines
-- 2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx