This is a note to let you know that I've just added the patch titled
drm/udl: Restore display mode on resume
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-udl-restore-display-mode-on-resume.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6d6e732835db92e66c28dbcf258a7e3d3c71420d Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 8 Sep 2022 11:51:04 +0200
Subject: drm/udl: Restore display mode on resume
From: Takashi Iwai <tiwai@xxxxxxx>
commit 6d6e732835db92e66c28dbcf258a7e3d3c71420d upstream.
Restore the display mode whne resuming from suspend. Currently, the
display remains dark.
On resume, the CRTC's mode does not change, but the 'active' flag
changes to 'true'. Taking this into account when considering a mode
switch restores the display mode.
The bug is reproducable by using Gnome with udl and observing the
adapter's suspend/resume behavior.
Actually, the whole check added in udl_simple_display_pipe_enable()
about the crtc_state->mode_changed was bogus. We should drop the
whole check and always apply the mode change in this function.
[ tiwai -- Drop the mode_changed check entirely instead, per Daniel's
suggestion ]
Fixes: 997d33c35618 ("drm/udl: Inline DPMS code into CRTC enable and disable functions")
Cc: <stable@xxxxxxxxxxxxxxx>
Suggested-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20220908095115.23396-2-tiwai@xxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/udl/udl_modeset.c | 3 ---
1 file changed, 3 deletions(-)
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -382,9 +382,6 @@ udl_simple_display_pipe_enable(struct dr
udl_handle_damage(fb, &shadow_plane_state->data[0], 0, 0, fb->width, fb->height);
- if (!crtc_state->mode_changed)
- return;
-
/* enable display */
udl_crtc_write_mode_to_hw(crtc);
}
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-6.0/alsa-rawmidi-drop-register_mutex-in-snd_rawmidi_free.patch
queue-6.0/alsa-oss-fix-potential-deadlock-at-unregistration.patch
queue-6.0/alsa-usb-audio-fix-potential-memory-leaks.patch
queue-6.0/alsa-hda-realtek-add-quirk-for-asus-gv601r-laptop.patch
queue-6.0/alsa-hda-realtek-correct-pin-configs-for-asus-g533z.patch
queue-6.0/alsa-hda-realtek-remove-alc289_fixup_dual_spk-for-dell-5530.patch
queue-6.0/alsa-hda-realtek-add-intel-reference-ssid-to-support-headset-keys.patch
queue-6.0/drm-udl-restore-display-mode-on-resume.patch
queue-6.0/alsa-usb-audio-fix-null-dererence-at-error-path.patch
