drm/msm/dp: Sleep properly in dp_hpd_handler kthread
authorStephen Boyd <swboyd@chromium.org>
Thu, 17 Sep 2020 22:44:25 +0000 (15:44 -0700)
committerRob Clark <robdclark@chromium.org>
Sun, 20 Sep 2020 17:12:51 +0000 (10:12 -0700)
We shouldn't be waiting for an event here with a timeout of 100ms when
we're not in the 'timeout' arm of the if condition. Instead we should be
sleeping in the interruptible state (S) until something happens and we
need to wakeup. Right now this kthread is running almost all the time
because it sleeps for 100ms, wakes up, sees there's nothing to do, and
then starts the process all over again. Looking at top it shows up in
the D state (uninterruptible) because it uses wait_event_timeout(). FIx
this up.

Cc: Tanmay Shah <tanmay@codeaurora.org>
Cc: Kuogee Hsieh <khsieh@codeaurora.org>
Reported-by: Douglas Anderson <dianders@chromium.org>
Fixes: 8ede2ecc3e5e ("drm/msm/dp: Add DP compliance tests on Snapdragon Chipsets")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Kuogee Hsieh <khsieh@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/dp/dp_display.c

index 05a97e0..e175aa3 100644 (file)
@@ -970,9 +970,8 @@ static int hpd_event_thread(void *data)
                                (dp_priv->event_pndx == dp_priv->event_gndx),
                                                EVENT_TIMEOUT);
                } else {
-                       wait_event_timeout(dp_priv->event_q,
-                               (dp_priv->event_pndx != dp_priv->event_gndx),
-                                               EVENT_TIMEOUT);
+                       wait_event_interruptible(dp_priv->event_q,
+                               (dp_priv->event_pndx != dp_priv->event_gndx));
                }
                spin_lock_irqsave(&dp_priv->event_lock, flag);
                todo = &dp_priv->event_list[dp_priv->event_gndx];