6.8-stable patches

added patches:
	drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch

diff --git a/queue-6.8/drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch b/queue-6.8/drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch
new file mode 100644 (file)
index 0000000..b9b183a
--- /dev/null
+++ b/queue-6.8/drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch
@@ -0,0 +1,42 @@
+From 048a36d8a6085bbd8ab9e5794b713b92ac986450 Mon Sep 17 00:00:00 2001
+From: Shradha Gupta <shradhagupta@linux.microsoft.com>
+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@linux.microsoft.com>
+
+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@intel.com>
+Closes: https://lore.kernel.org/oe-lkp/202401191128.db8423f1-oliver.sang@intel.com
+Signed-off-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: https://patchwork.freedesktop.org/patch/msgid/1706856224-9725-1-git-send-email-shradhagupta@linux.microsoft.com
+Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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",

diff --git a/queue-6.8/series b/queue-6.8/series
index 653478e8fb836ca208e0c3e07f2b9eb587aa7239..708d2321867bf4590c2b60513ea41c78550a327d 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -84,6 +84,7 @@ i2c-designware-fix-rx-fifo-depth-define-on-wangxun-1.patch
 hid-input-avoid-polling-stylus-battery-on-chromebook.patch
 drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in.patch
 drm-check-output-polling-initialized-before-disablin.patch
+drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch
 sunrpc-increase-size-of-rpc_wait_queue.qlen-from-uns.patch
 pci-disable-d3cold-on-asus-b1400-pci-nvme-bridge.patch
 revert-acpi-pm-block-asus-b1400ceae-from-suspend-to-.patch