drm/msm/dpu: use msm wq for idle power collapse

msm is using msm wq for dispatching commit and vblank
events. Switch idle power collapse feature also to use
msm wq to handle delayed work handlers so that
msm can get rid of redundant display threads.

changes in v2:
	- patch introduced in v2
changes in v3:
	- none
changes in v4:
	- use msm wq for delayed works
changes in v5:
	- none

Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 36158b7d99cdb14a063b0c63be57a93314008c61..3d1e1e4cdac5ffdcf16799a9a5e6011e8f910d0f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -205,7 +205,7 @@ struct dpu_encoder_virt {
        bool idle_pc_supported;
        struct mutex rc_lock;
        enum dpu_enc_rc_states rc_state;
-       struct kthread_delayed_work delayed_off_work;
+       struct delayed_work delayed_off_work;
        struct kthread_work vsync_event_work;
        struct msm_display_topology topology;
        bool mode_set_complete;
@@ -742,7 +742,6 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,
 {
        struct dpu_encoder_virt *dpu_enc;
        struct msm_drm_private *priv;
-       struct msm_drm_thread *disp_thread;
        bool is_vid_mode = false;
 
        if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private ||
@@ -755,12 +754,6 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,
        is_vid_mode = dpu_enc->disp_info.capabilities &
                                                MSM_DISPLAY_CAP_VID_MODE;
 
-       if (drm_enc->crtc->index >= ARRAY_SIZE(priv->disp_thread)) {
-               DPU_ERROR("invalid crtc index\n");
-               return -EINVAL;
-       }
-       disp_thread = &priv->disp_thread[drm_enc->crtc->index];
-
        /*
         * when idle_pc is not supported, process only KICKOFF, STOP and MODESET
         * events and return early for other events (ie wb display).
@@ -777,8 +770,7 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,
        switch (sw_event) {
        case DPU_ENC_RC_EVENT_KICKOFF:
                /* cancel delayed off work, if any */
-               if (kthread_cancel_delayed_work_sync(
-                               &dpu_enc->delayed_off_work))
+               if (cancel_delayed_work_sync(&dpu_enc->delayed_off_work))
                        DPU_DEBUG_ENC(dpu_enc, "sw_event:%d, work cancelled\n",
                                        sw_event);
 
@@ -837,10 +829,8 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,
                        return 0;
                }
 
-               kthread_queue_delayed_work(
-                       &disp_thread->worker,
-                       &dpu_enc->delayed_off_work,
-                       msecs_to_jiffies(dpu_enc->idle_timeout));
+               queue_delayed_work(priv->wq, &dpu_enc->delayed_off_work,
+                                  msecs_to_jiffies(dpu_enc->idle_timeout));
 
                trace_dpu_enc_rc(DRMID(drm_enc), sw_event,
                                 dpu_enc->idle_pc_supported, dpu_enc->rc_state,
@@ -849,8 +839,7 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,
 
        case DPU_ENC_RC_EVENT_PRE_STOP:
                /* cancel delayed off work, if any */
-               if (kthread_cancel_delayed_work_sync(
-                               &dpu_enc->delayed_off_work))
+               if (cancel_delayed_work_sync(&dpu_enc->delayed_off_work))
                        DPU_DEBUG_ENC(dpu_enc, "sw_event:%d, work cancelled\n",
                                        sw_event);
 
@@ -1368,7 +1357,7 @@ static void dpu_encoder_frame_done_callback(
        }
 }
 
-static void dpu_encoder_off_work(struct kthread_work *work)
+static void dpu_encoder_off_work(struct work_struct *work)
 {
        struct dpu_encoder_virt *dpu_enc = container_of(work,
                        struct dpu_encoder_virt, delayed_off_work.work);
@@ -2193,7 +2182,7 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
 
 
        mutex_init(&dpu_enc->rc_lock);
-       kthread_init_delayed_work(&dpu_enc->delayed_off_work,
+       INIT_DELAYED_WORK(&dpu_enc->delayed_off_work,
                        dpu_encoder_off_work);
        dpu_enc->idle_timeout = IDLE_TIMEOUT;