[PATCH 2/3] drm/msm/dpu: Drop unused get_scaler_ver callback from SSPP

From: Marijn Suijten
Date: Wed Feb 15 2023 - 18:02:45 EST


This pointer callback is never used and should be removed. The helper
_dpu_hw_sspp_get_scaler3_ver function is retained as it is being used by
dpu_hw_sspp_init which didn't itself compute _sspp_subblk_offset yet.

Signed-off-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 4 +---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 ------
2 files changed, 1 insertion(+), 9 deletions(-)

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 d4e181e1378c..00e5dc2318db 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -689,10 +689,8 @@ static void _setup_layer_ops(struct dpu_hw_pipe *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 eeaf16c6af15..bebb62c09dd8 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
@@ -329,12 +329,6 @@ struct dpu_hw_sspp_ops {
struct dpu_hw_pipe_cfg *pipe_cfg,
void *scaler_cfg);

- /**
- * get_scaler_ver - get scaler h/w version
- * @ctx: Pointer to pipe context
- */
- u32 (*get_scaler_ver)(struct dpu_hw_pipe *ctx);
-
/**
* setup_cdp - setup client driven prefetch
* @ctx: Pointer to pipe context

--
2.39.2