From: Greg Kroah-Hartman Date: Fri, 12 Apr 2024 08:28:08 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v4.19.312~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=426d54f1bdaede738e5893c6079c4280a5116cd7;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch --- diff --git a/queue-6.6/drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch b/queue-6.6/drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch new file mode 100644 index 00000000000..b9b183a4ce0 --- /dev/null +++ b/queue-6.6/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 +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 + +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 +Closes: https://lore.kernel.org/oe-lkp/202401191128.db8423f1-oliver.sang@intel.com +Signed-off-by: Shradha Gupta +Signed-off-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/1706856224-9725-1-git-send-email-shradhagupta@linux.microsoft.com +Cc: Holger Hoffstätte +Signed-off-by: Greg Kroah-Hartman +--- + 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.6/series b/queue-6.6/series index 085157c9573..e752e23c5cf 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -110,3 +110,4 @@ bluetooth-btintel-fixe-build-regression.patch net-mpls-error-out-if-inner-headers-are-not-set.patch vmci-fix-possible-memcpy-run-time-warning-in-vmci_datagram_invoke_guest_handler.patch revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch +drm-check-polling-initialized-before-enabling-in-drm_helper_probe_single_connector_modes.patch