Merge tag 'drm-next-2024-03-22' of https://gitlab.freedesktop.org/drm/kernel

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_probe_helper.c

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 75f84753f6ee339f28647923426ca9c4e3c4d83a..bf2dd1f46b6c4f17577c849a375114443a094a28 100644 (file)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -774,9 +774,11 @@ static void output_poll_execute(struct work_struct *work)
        changed = dev->mode_config.delayed_event;
        dev->mode_config.delayed_event = false;
 
-       if (!drm_kms_helper_poll && dev->mode_config.poll_running) {
-               drm_kms_helper_disable_hpd(dev);
-               dev->mode_config.poll_running = false;
+       if (!drm_kms_helper_poll) {
+               if (dev->mode_config.poll_running) {
+                       drm_kms_helper_disable_hpd(dev);
+                       dev->mode_config.poll_running = false;
+               }
                goto out;
        }