Skip to content

Commit 1e07507

Browse files
Fredrik Schöngregkh
authored andcommitted
drm/i915: Increase LSPCON timeout
commit 299c2a9 upstream. 100 ms is not enough time for the LSPCON adapter on Intel NUC devices to settle. This causes dropped display modes at boot or screen reconfiguration. Empirical testing can reproduce the error up to a timeout of 190 ms. Basic boot and stress testing at 200 ms has not (yet) failed. Increase timeout to 400 ms to get some margin of error. Changes from v1: The initial suggestion of 1000 ms was lowered due to concerns about delaying valid timeout cases. Update patch metadata. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107503 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1570392 Fixes: 357c0ae ("drm/i915/lspcon: Wait for expected LSPCON mode to settle") Cc: Shashank Sharma <[email protected]> Cc: Imre Deak <[email protected]> Cc: Jani Nikula <[email protected]> Cc: <[email protected]> # v4.11+ Reviewed-by: Rodrigo Vivi <[email protected]> Reviewed-by: Shashank Sharma <[email protected]> Signed-off-by: Fredrik Schön <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 59f1c8a) Signed-off-by: Rodrigo Vivi <[email protected]> Reviewed-by: Shashank Sharma <[email protected]> Signed-off-by: Fredrik Schön <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 13b23cc commit 1e07507

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/i915/intel_lspcon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon,
7575
lspcon_mode_name(mode));
7676

7777
wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode ||
78-
current_mode == DRM_LSPCON_MODE_INVALID, 100);
78+
current_mode == DRM_LSPCON_MODE_INVALID, 400);
7979
if (current_mode != mode)
8080
DRM_DEBUG_KMS("LSPCON mode hasn't settled\n");
8181

0 commit comments

Comments
 (0)