From: Greg Kroah-Hartman Date: Thu, 31 Aug 2023 12:30:26 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.5.1~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27870cd55675a26d387f64f6199d0170b4aad86e;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index 375d7482e37..0ca818f0ad6 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -8,3 +8,4 @@ parisc-cleanup-mmap-implementation-regarding-color-alignment.patch parisc-sys_parisc-parisc_personality-is-called-from-asm-code.patch io_uring-parisc-adjust-pgoff-in-io_uring-mmap-for-parisc.patch kallsyms-fix-kallsyms_selftest-failure.patch +thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch diff --git a/queue-6.1/thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch b/queue-6.1/thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch new file mode 100644 index 00000000000..9f59ba4cd23 --- /dev/null +++ b/queue-6.1/thunderbolt-fix-a-backport-error-for-display-flickering-issue.patch @@ -0,0 +1,33 @@ +From mario.limonciello@amd.com Thu Aug 31 14:29:42 2023 +From: Mario Limonciello +Date: Thu, 31 Aug 2023 06:34:21 -0500 +Subject: thunderbolt: Fix a backport error for display flickering issue +To: +Cc: Mario Limonciello , +Message-ID: <20230831113421.158244-1-mario.limonciello@amd.com> + +From: Mario Limonciello + +A mistake was made when backporting commit 583893a66d73 ("thunderbolt: Fix +Thunderbolt 3 display flickering issue on 2nd hot plug onwards") in missing +the `if` block. Add it back in. + +Reported-by: Joakim.Tjernlund@infinera.com +Closes: https://lore.kernel.org/stable/28b5d0accce90bedf2f75d65290c5a1302225f0f.camel@infinera.com/ +Fixes: 06614ca4f18e ("thunderbolt: Fix Thunderbolt 3 display flickering issue on 2nd hot plug onwards") +Signed-off-by: Mario Limonciello +Signed-off-by: Greg Kroah-Hartman +--- + drivers/thunderbolt/tmu.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/thunderbolt/tmu.c ++++ b/drivers/thunderbolt/tmu.c +@@ -416,6 +416,7 @@ int tb_switch_tmu_disable(struct tb_swit + * mode. + */ + ret = tb_switch_tmu_rate_write(sw, TB_SWITCH_TMU_RATE_OFF); ++ if (ret) + return ret; + + tb_port_tmu_time_sync_disable(up);