From e5faa1e53d448b2ae4f6be6768186e625ef15b29 Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 8 Sep 2018 14:12:22 -0300 Subject: upgpkg: libre/linux-libre-hardened 4.18.6.a_gnu-1 Signed-off-by: David P --- .../drm-i915-Increase-LSPCON-timeout.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch (limited to 'libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch') diff --git a/libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch b/libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch new file mode 100644 index 000000000..38ec01fee --- /dev/null +++ b/libre/linux-libre-hardened/drm-i915-Increase-LSPCON-timeout.patch @@ -0,0 +1,54 @@ +From 299c2a904b1e8d5096d4813df6371357d97a6cd1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fredrik=20Sch=C3=B6n?= +Date: Fri, 17 Aug 2018 22:07:28 +0200 +Subject: [PATCH] drm/i915: Increase LSPCON timeout +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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: 357c0ae9198a ("drm/i915/lspcon: Wait for expected LSPCON mode to settle") +Cc: Shashank Sharma +Cc: Imre Deak +Cc: Jani Nikula +Cc: # v4.11+ +Reviewed-by: Rodrigo Vivi +Reviewed-by: Shashank Sharma +Signed-off-by: Fredrik Schön +Signed-off-by: Jani Nikula +Link: https://patchwork.freedesktop.org/patch/msgid/20180817200728.8154-1-fredrik.schon@gmail.com +(cherry picked from commit 59f1c8ab30d6f9042562949f42cbd3f3cf69de94) +Signed-off-by: Rodrigo Vivi +--- + drivers/gpu/drm/i915/intel_lspcon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c +index 5dae16ccd9f1..3e085c5f2b81 100644 +--- a/drivers/gpu/drm/i915/intel_lspcon.c ++++ b/drivers/gpu/drm/i915/intel_lspcon.c +@@ -74,7 +74,7 @@ static enum drm_lspcon_mode lspcon_wait_mode(struct intel_lspcon *lspcon, + 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, 100); ++ wait_for((current_mode = lspcon_get_current_mode(lspcon)) == mode, 400); + if (current_mode != mode) + DRM_ERROR("LSPCON mode hasn't settled\n"); + +-- +2.18.0 + -- cgit v1.2.3