drm/msm/dpu: Remove empty prepare_commit() function

Now that the TE setup has been moved to prepare_for_kickoff(),  we have
not prepare_commit() callbacks left. This makes dpu_encoder_prepare_commit()
do nothing. Remove prepare_commit() from DPU driver.

Changes in V3:
- Reworded commit message to be more clear
- Corrected spelling mistake in commit message

Changes in V4:
- Reworded commit message for clarity

Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Patchwork: https://patchwork.freedesktop.org/patch/523606/
Link: https://lore.kernel.org/r/20230221184256.1436-4-quic_jesszhan@quicinc.com
[DB: fixed merge conflict]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 450abb14ac2fd79f8e76520d0963ef64fc95dd90..e4744565bb47227800e2f735a3c3d27c8f237887 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -2094,25 +2094,6 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)
        ctl->ops.clear_pending_flush(ctl);
 }
 
-void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc)
-{
-       struct dpu_encoder_virt *dpu_enc;
-       struct dpu_encoder_phys *phys;
-       int i;
-
-       if (!drm_enc) {
-               DPU_ERROR("invalid encoder\n");
-               return;
-       }
-       dpu_enc = to_dpu_encoder_virt(drm_enc);
-
-       for (i = 0; i < dpu_enc->num_phys_encs; i++) {
-               phys = dpu_enc->phys_encs[i];
-               if (phys->ops.prepare_commit)
-                       phys->ops.prepare_commit(phys);
-       }
-}
-
 #ifdef CONFIG_DEBUG_FS
 static int _dpu_encoder_status_show(struct seq_file *s, void *data)
 {

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
index 9e7236ef34e6d6041497223e3005156023516143..2c9ef8d1b87799802c8acc586b054cd9a65f919f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
@@ -146,13 +146,6 @@ struct drm_encoder *dpu_encoder_init(
 int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
                struct msm_display_info *disp_info);
 
-/**
- * dpu_encoder_prepare_commit - prepare encoder at the very beginning of an
- *     atomic commit, before any registers are written
- * @drm_enc:    Pointer to previously created drm encoder structure
- */
-void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc);
-
 /**
  * dpu_encoder_set_idle_timeout - set the idle timeout for video
  *                    and command mode encoders.

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 6cd7be500dfeee29e4994ca8ccfc1afa990ab321..75faaf4f75477731c2ace69c9bdef598de0c5c48 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -411,26 +411,6 @@ static void dpu_kms_disable_commit(struct msm_kms *kms)
        pm_runtime_put_sync(&dpu_kms->pdev->dev);
 }
 
-static void dpu_kms_prepare_commit(struct msm_kms *kms,
-               struct drm_atomic_state *state)
-{
-       struct drm_crtc *crtc;
-       struct drm_crtc_state *crtc_state;
-       struct drm_encoder *encoder;
-       int i;
-
-       if (!kms)
-               return;
-
-       /* Call prepare_commit for all affected encoders */
-       for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
-               drm_for_each_encoder_mask(encoder, crtc->dev,
-                                         crtc_state->encoder_mask) {
-                       dpu_encoder_prepare_commit(encoder);
-               }
-       }
-}
-
 static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask)
 {
        struct dpu_kms *dpu_kms = to_dpu_kms(kms);
@@ -939,7 +919,6 @@ static const struct msm_kms_funcs kms_funcs = {
        .irq             = dpu_core_irq,
        .enable_commit   = dpu_kms_enable_commit,
        .disable_commit  = dpu_kms_disable_commit,
-       .prepare_commit  = dpu_kms_prepare_commit,
        .flush_commit    = dpu_kms_flush_commit,
        .wait_flush      = dpu_kms_wait_flush,
        .complete_commit = dpu_kms_complete_commit,