drm/msm/dpu: async commit support

In addition, moving to kms->flush_commit() lets us drop the only user
of kms->commit().

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Sean Paul <sean@poorly.run>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 55f7fa2000af231ac8cbec963d82ab27576f1ac4..ce59adff06aa13c273ca3b8f96ba857d5945c36f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -608,7 +608,6 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)
        struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
        struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc);
        struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
-       int ret;
 
        /*
         * If no mixers has been allocated in dpu_crtc_atomic_check(),
@@ -628,17 +627,6 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)
                                  crtc->state->encoder_mask)
                dpu_encoder_prepare_for_kickoff(encoder);
 
-       /* wait for previous frame_event_done completion */
-       DPU_ATRACE_BEGIN("wait_for_frame_done_event");
-       ret = _dpu_crtc_wait_for_frame_done(crtc);
-       DPU_ATRACE_END("wait_for_frame_done_event");
-       if (ret) {
-               DPU_ERROR("crtc%d wait for frame done failed;frame_pending%d\n",
-                               crtc->base.id,
-                               atomic_read(&dpu_crtc->frame_pending));
-               goto end;
-       }
-
        if (atomic_inc_return(&dpu_crtc->frame_pending) == 1) {
                /* acquire bandwidth and other resources */
                DPU_DEBUG("crtc%d first commit\n", crtc->base.id);
@@ -652,7 +640,6 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc)
        drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
                dpu_encoder_kickoff(encoder);
 
-end:
        reinit_completion(&dpu_crtc->frame_done_comp);
        DPU_ATRACE_END("crtc_commit");
 }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 090c304adfef4e3b53a6c76c2afae46874f531e6..d82ea994063faa895c12c41118a2a9e08f8b5d65 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1680,8 +1680,7 @@ static u32 _dpu_encoder_calculate_linetime(struct dpu_encoder_virt *dpu_enc,
        return line_time;
 }
 
-static int _dpu_encoder_wakeup_time(struct drm_encoder *drm_enc,
-               ktime_t *wakeup_time)
+int dpu_encoder_vsync_time(struct drm_encoder *drm_enc, ktime_t *wakeup_time)
 {
        struct drm_display_mode *mode;
        struct dpu_encoder_virt *dpu_enc;
@@ -1768,7 +1767,7 @@ static void dpu_encoder_vsync_event_work_handler(struct kthread_work *work)
                return;
        }
 
-       if (_dpu_encoder_wakeup_time(&dpu_enc->base, &wakeup_time))
+       if (dpu_encoder_vsync_time(&dpu_enc->base, &wakeup_time))
                return;
 
        trace_dpu_enc_vsync_event_work(DRMID(&dpu_enc->base), wakeup_time);
@@ -1842,7 +1841,7 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc)
        }
 
        if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
-                       !_dpu_encoder_wakeup_time(drm_enc, &wakeup_time)) {
+                       !dpu_encoder_vsync_time(drm_enc, &wakeup_time)) {
                trace_dpu_enc_early_kickoff(DRMID(drm_enc),
                                            ktime_to_ms(wakeup_time));
                mod_timer(&dpu_enc->vsync_event_timer,

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
index 8465b37adf3bd306d7999462ccd4e1cbba7bce44..b4913465e60253f98b3a08d248be8301bb5d6afe 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
@@ -85,6 +85,11 @@ void dpu_encoder_trigger_kickoff_pending(struct drm_encoder *encoder);
  */
 void dpu_encoder_kickoff(struct drm_encoder *encoder);
 
+/**
+ * dpu_encoder_wakeup_time - get the time of the next vsync
+ */
+int dpu_encoder_vsync_time(struct drm_encoder *drm_enc, ktime_t *wakeup_time);
+
 /**
  * dpu_encoder_wait_for_event - Waits for encoder events
  * @encoder:   encoder pointer

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 2f0f379f3ae1576602b0957aefde95e44357b957..58b0485dc37500357f165690bc79ba3156c357c6 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -262,6 +262,20 @@ static void dpu_kms_disable_commit(struct msm_kms *kms)
        pm_runtime_put_sync(&dpu_kms->pdev->dev);
 }
 
+static ktime_t dpu_kms_vsync_time(struct msm_kms *kms, struct drm_crtc *crtc)
+{
+       struct drm_encoder *encoder;
+
+       drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask) {
+               ktime_t vsync_time;
+
+               if (dpu_encoder_vsync_time(encoder, &vsync_time) == 0)
+                       return vsync_time;
+       }
+
+       return ktime_get();
+}
+
 static void dpu_kms_prepare_commit(struct msm_kms *kms,
                struct drm_atomic_state *state)
 {
@@ -293,7 +307,16 @@ static void dpu_kms_prepare_commit(struct msm_kms *kms,
 
 static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask)
 {
-       /* TODO */
+       struct dpu_kms *dpu_kms = to_dpu_kms(kms);
+       struct drm_crtc *crtc;
+
+       for_each_crtc_mask(dpu_kms->dev, crtc, crtc_mask) {
+               if (!crtc->state->active)
+                       continue;
+
+               trace_dpu_kms_commit(DRMID(crtc));
+               dpu_crtc_commit_kickoff(crtc);
+       }
 }
 
 /*
@@ -316,25 +339,6 @@ void dpu_kms_encoder_enable(struct drm_encoder *encoder)
                        continue;
 
                trace_dpu_kms_enc_enable(DRMID(crtc));
-               dpu_crtc_commit_kickoff(crtc);
-       }
-}
-
-static void dpu_kms_commit(struct msm_kms *kms, struct drm_atomic_state *state)
-{
-       struct drm_crtc *crtc;
-       struct drm_crtc_state *crtc_state;
-       int i;
-
-       for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
-               /* If modeset is required, kickoff is run in encoder_enable */
-               if (drm_atomic_crtc_needs_modeset(crtc_state))
-                       continue;
-
-               if (crtc->state->active) {
-                       trace_dpu_kms_commit(DRMID(crtc));
-                       dpu_crtc_commit_kickoff(crtc);
-               }
        }
 }
 
@@ -695,9 +699,9 @@ static const struct msm_kms_funcs kms_funcs = {
        .irq             = dpu_irq,
        .enable_commit   = dpu_kms_enable_commit,
        .disable_commit  = dpu_kms_disable_commit,
+       .vsync_time      = dpu_kms_vsync_time,
        .prepare_commit  = dpu_kms_prepare_commit,
        .flush_commit    = dpu_kms_flush_commit,
-       .commit          = dpu_kms_commit,
        .wait_flush      = dpu_kms_wait_flush,
        .complete_commit = dpu_kms_complete_commit,
        .enable_vblank   = dpu_kms_enable_vblank,

diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 55c8d72f84011681643fafa3df448f2a6c4dc622..9676e29066497f05b2070eaefab66c1b5ef79cf0 100644 (file)
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -210,10 +210,7 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)
        /*
         * Flush hardware updates:
         */
-       if (kms->funcs->commit) {
-               DRM_DEBUG_ATOMIC("triggering commit\n");
-               kms->funcs->commit(kms, state);
-       }
+       DRM_DEBUG_ATOMIC("triggering commit\n");
        kms->funcs->flush_commit(kms, crtc_mask);
        mutex_unlock(&kms->commit_lock);
 

diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h
index ed8df60a32ad7c9891140e55909b5c99e8cebd6e..1cbef6b200b708d9dca4e2749ce8d28b90197b66 100644 (file)
--- a/drivers/gpu/drm/msm/msm_kms.h
+++ b/drivers/gpu/drm/msm/msm_kms.h
@@ -80,9 +80,6 @@ struct msm_kms_funcs {
         */
        void (*flush_commit)(struct msm_kms *kms, unsigned crtc_mask);
 
-       /* TODO remove ->commit(), use ->flush_commit() instead: */
-       void (*commit)(struct msm_kms *kms, struct drm_atomic_state *state);
-
        /**
         * Wait for any in-progress flush to complete on the specified
         * crtcs.  This should not block if there is no in-progress