git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 048a36d8a6085bbd8ab9e5794b713b92ac986450 Mon Sep 17 00:00:00 2001
   2 From: Shradha Gupta <shradhagupta@linux.microsoft.com>
   3 Date: Thu, 1 Feb 2024 22:43:44 -0800
   4 Subject: drm: Check polling initialized before enabling in drm_helper_probe_single_connector_modes
   5
   6 From: Shradha Gupta <shradhagupta@linux.microsoft.com>
   7
   8 commit 048a36d8a6085bbd8ab9e5794b713b92ac986450 upstream.
   9
  10 In function drm_helper_probe_single_connector_modes() when we enable
  11 polling again, if it is already uninitialized, a warning is reported.
  12 This patch fixes the warning message by checking if poll is initialized
  13 before enabling it.
  14
  15 Reported-by: kernel test robot <oliver.sang@intel.com>
  16 Closes: https://lore.kernel.org/oe-lkp/202401191128.db8423f1-oliver.sang@intel.com
  17 Signed-off-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
  18 Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  19 Link: https://patchwork.freedesktop.org/patch/msgid/1706856224-9725-1-git-send-email-shradhagupta@linux.microsoft.com
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/gpu/drm/drm_probe_helper.c |    3 ++-
  23  1 file changed, 2 insertions(+), 1 deletion(-)
  24
  25 --- a/drivers/gpu/drm/drm_probe_helper.c
  26 +++ b/drivers/gpu/drm/drm_probe_helper.c
  27 @@ -574,7 +574,8 @@ retry:
  28         }
  29
  30         /* Re-enable polling in case the global poll config changed. */
  31 -       if (drm_kms_helper_poll != dev->mode_config.poll_running)
  32 +       if (dev->mode_config.poll_enabled &&
  33 +           (drm_kms_helper_poll != dev->mode_config.poll_running))
  34                 drm_kms_helper_poll_enable(dev);
  35
  36         dev->mode_config.poll_running = drm_kms_helper_poll;