]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm: Check polling initialized before enabling in drm_helper_probe_single_connector_modes
authorShradha Gupta <shradhagupta@linux.microsoft.com>
Fri, 2 Feb 2024 06:43:44 +0000 (22:43 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Jun 2024 11:39:53 +0000 (13:39 +0200)
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/drm_probe_helper.c

index 08d75590fdc04aae7961a8c86aa7c0b733d4eace..e79bb93072dd8fe9239addfd77e6d23cb5f55d08 100644 (file)
@@ -498,7 +498,8 @@ retry:
        }
 
        /* Re-enable polling in case the global poll config changed. */
-       if (drm_kms_helper_poll != dev->mode_config.poll_running)
+       if (dev->mode_config.poll_enabled &&
+           (drm_kms_helper_poll != dev->mode_config.poll_running))
                drm_kms_helper_poll_enable(dev);
 
        dev->mode_config.poll_running = drm_kms_helper_poll;