This is a note to let you know that I've just added the patch titled
drm: Check polling initialized before enabling in drm_helper_probe_single_connector_modes
to the 6.6-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-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 048a36d8a6085bbd8ab9e5794b713b92ac986450 Mon Sep 17 00:00:00 2001
From: Shradha Gupta <shradhagupta@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 1 Feb 2024 22:43:44 -0800
Subject: drm: Check polling initialized before enabling in drm_helper_probe_single_connector_modes
From: Shradha Gupta <shradhagupta@xxxxxxxxxxxxxxxxxxx>
commit 048a36d8a6085bbd8ab9e5794b713b92ac986450 upstream.
In function drm_helper_probe_single_connector_modes() when we enable
polling again, if it is already uninitialized, a warning is reported.
This patch fixes the warning message by checking if poll is initialized
before enabling it.
Reported-by: kernel test robot <oliver.sang@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-lkp/202401191128.db8423f1-oliver.sang@xxxxxxxxx
Signed-off-by: Shradha Gupta <shradhagupta@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/1706856224-9725-1-git-send-email-shradhagupta@xxxxxxxxxxxxxxxxxxx
Cc: Holger Hoffstätte <holger@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/drm_probe_helper.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -629,8 +629,12 @@ retry:
0);
}
- /* Re-enable polling in case the global poll config changed. */
- drm_kms_helper_poll_enable(dev);
+ /*
+ * Re-enable polling in case the global poll config changed but polling
+ * is still initialized.
+ */
+ if (dev->mode_config.poll_enabled)
+ drm_kms_helper_poll_enable(dev);
if (connector->status == connector_status_disconnected) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
Patches currently in stable-queue which might be from shradhagupta@xxxxxxxxxxxxxxxxxxx are
queue-6.6/drm-check-output-polling-initialized-before-disablin.patch
queue-6.6/drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch
