drm/msm/dpu: Drop unused get_scaler_ver callback from SSPP

This pointer callback is never used and should be removed.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
[DB: dropped the helpers completely, which are unused now]
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/570096/
Link: https://lore.kernel.org/r/20231201234234.2065610-3-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
index 8e3c65989c4989c2e74efdb963ed2824460e5751..b408d456c123dabc7becda7f710d327cd39901b1 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -395,15 +395,6 @@ static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_sspp *ctx,
                        format);
 }
 
-static u32 _dpu_hw_sspp_get_scaler3_ver(struct dpu_hw_sspp *ctx)
-{
-       if (!ctx)
-               return 0;
-
-       return dpu_hw_get_scaler3_ver(&ctx->hw,
-                                     ctx->cap->sblk->scaler_blk.base);
-}
-
 /*
  * dpu_hw_sspp_setup_rects()
  */
@@ -616,10 +607,8 @@ static void _setup_layer_ops(struct dpu_hw_sspp *c,
 
        if (test_bit(DPU_SSPP_SCALER_QSEED3, &features) ||
                        test_bit(DPU_SSPP_SCALER_QSEED3LITE, &features) ||
-                       test_bit(DPU_SSPP_SCALER_QSEED4, &features)) {
+                       test_bit(DPU_SSPP_SCALER_QSEED4, &features))
                c->ops.setup_scaler = _dpu_hw_sspp_setup_scaler3;
-               c->ops.get_scaler_ver = _dpu_hw_sspp_get_scaler3_ver;
-       }
 
        if (test_bit(DPU_SSPP_CDP, &features))
                c->ops.setup_cdp = dpu_hw_sspp_setup_cdp;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
index f93969fddb225465d151e110a930d419e69bbfb3..b094ea23ad32573c0ae227d77a22d4d2a869b537 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
@@ -296,12 +296,6 @@ struct dpu_hw_sspp_ops {
                struct dpu_hw_scaler3_cfg *scaler3_cfg,
                const struct dpu_format *format);
 
-       /**
-        * get_scaler_ver - get scaler h/w version
-        * @ctx: Pointer to pipe context
-        */
-       u32 (*get_scaler_ver)(struct dpu_hw_sspp *ctx);
-
        /**
         * setup_cdp - setup client driven prefetch
         * @pipe: Pointer to software pipe context

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c
index 18b16b2d2bf52ff791a313272ce91424553acda5..0b05061e3e62191200d2247a79fcb3762ab447f5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c
@@ -381,12 +381,6 @@ end:
        DPU_REG_WRITE(c, QSEED3_OP_MODE + scaler_offset, op_mode);
 }
 
-u32 dpu_hw_get_scaler3_ver(struct dpu_hw_blk_reg_map *c,
-                       u32 scaler_offset)
-{
-       return DPU_REG_READ(c, QSEED3_HW_VERSION + scaler_offset);
-}
-
 void dpu_hw_csc_setup(struct dpu_hw_blk_reg_map *c,
                u32 csc_reg_off,
                const struct dpu_csc_cfg *data, bool csc10)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
index 4bea139081bcd6c726bf29c7cd303627b5917ce3..fe083b2e5696ae4b133aa62ae9c474bc099b6f8c 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h
@@ -340,9 +340,6 @@ void dpu_hw_setup_scaler3(struct dpu_hw_blk_reg_map *c,
                u32 scaler_offset, u32 scaler_version,
                const struct dpu_format *format);
 
-u32 dpu_hw_get_scaler3_ver(struct dpu_hw_blk_reg_map *c,
-               u32 scaler_offset);
-
 void dpu_hw_csc_setup(struct dpu_hw_blk_reg_map  *c,
                u32 csc_reg_off,
                const struct dpu_csc_cfg *data, bool csc10);