drm/msm/dpu: encoder: drop unused mode_fixup callback

Both cmd and vid backends provide useless mode_fixup() callback. Drop
it.

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220217035358.465904-6-dmitry.baryshkov@linaro.org
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 3d5fd73..c7eb070 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -582,10 +582,6 @@ static int dpu_encoder_virt_atomic_check(
                if (phys->ops.atomic_check)
                        ret = phys->ops.atomic_check(phys, crtc_state,
                                        conn_state);
-               else if (phys->ops.mode_fixup)
-                       if (!phys->ops.mode_fixup(phys, mode, adj_mode))
-                               ret = -EINVAL;
-
                if (ret) {
                        DPU_ERROR_ENC(dpu_enc,
                                        "mode unsupported, phys idx %d\n", i);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
index 42febfc..6eb2eb4 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
@@ -84,7 +84,6 @@ struct dpu_encoder_virt_ops {
  * @is_master:                 Whether this phys_enc is the current master
  *                             encoder. Can be switched at enable time. Based
  *                             on split_role and current mode (CMD/VID).
- * @mode_fixup:                        DRM Call. Fixup a DRM mode.
  * @mode_set:                  DRM Call. Set a DRM mode.
  *                             This likely caches the mode, for use at enable.
  * @enable:                    DRM Call. Enable a DRM mode.
@@ -114,9 +113,6 @@ struct dpu_encoder_phys_ops {
                        struct dentry *debugfs_root);
        void (*prepare_commit)(struct dpu_encoder_phys *encoder);
        bool (*is_master)(struct dpu_encoder_phys *encoder);
-       bool (*mode_fixup)(struct dpu_encoder_phys *encoder,
-                       const struct drm_display_mode *mode,
-                       struct drm_display_mode *adjusted_mode);
        void (*mode_set)(struct dpu_encoder_phys *encoder,
                        struct drm_display_mode *mode,
                        struct drm_display_mode *adjusted_mode);

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index 7d2beea..96b9d57 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -45,15 +45,6 @@ static bool dpu_encoder_phys_cmd_is_master(struct dpu_encoder_phys *phys_enc)
        return (phys_enc->split_role != ENC_ROLE_SLAVE);
 }
 
-static bool dpu_encoder_phys_cmd_mode_fixup(
-               struct dpu_encoder_phys *phys_enc,
-               const struct drm_display_mode *mode,
-               struct drm_display_mode *adj_mode)
-{
-       DPU_DEBUG_CMDENC(to_dpu_encoder_phys_cmd(phys_enc), "\n");
-       return true;
-}
-
 static void _dpu_encoder_phys_cmd_update_intf_cfg(
                struct dpu_encoder_phys *phys_enc)
 {
@@ -725,7 +716,6 @@ static void dpu_encoder_phys_cmd_init_ops(
        ops->prepare_commit = dpu_encoder_phys_cmd_prepare_commit;
        ops->is_master = dpu_encoder_phys_cmd_is_master;
        ops->mode_set = dpu_encoder_phys_cmd_mode_set;
-       ops->mode_fixup = dpu_encoder_phys_cmd_mode_fixup;
        ops->enable = dpu_encoder_phys_cmd_enable;
        ops->disable = dpu_encoder_phys_cmd_disable;
        ops->destroy = dpu_encoder_phys_cmd_destroy;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index db6a9b8..7e837ca 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -225,19 +225,6 @@ static void programmable_fetch_config(struct dpu_encoder_phys *phys_enc,
        spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags);
 }
 
-static bool dpu_encoder_phys_vid_mode_fixup(
-               struct dpu_encoder_phys *phys_enc,
-               const struct drm_display_mode *mode,
-               struct drm_display_mode *adj_mode)
-{
-       DPU_DEBUG_VIDENC(phys_enc, "\n");
-
-       /*
-        * Modifying mode has consequences when the mode comes back to us
-        */
-       return true;
-}
-
 static void dpu_encoder_phys_vid_setup_timing_engine(
                struct dpu_encoder_phys *phys_enc)
 {
@@ -669,7 +656,6 @@ static void dpu_encoder_phys_vid_init_ops(struct dpu_encoder_phys_ops *ops)
 {
        ops->is_master = dpu_encoder_phys_vid_is_master;
        ops->mode_set = dpu_encoder_phys_vid_mode_set;
-       ops->mode_fixup = dpu_encoder_phys_vid_mode_fixup;
        ops->enable = dpu_encoder_phys_vid_enable;
        ops->disable = dpu_encoder_phys_vid_disable;
        ops->destroy = dpu_encoder_phys_vid_destroy;