drm/msm/dpu: drop pe argument from _dpu_hw_sspp_setup_scaler3

The _dpu_hw_sspp_setup_scaler3 (hw_sspp->setup_scaler) does not use pe
argument. Let's remove it while we are cleaning scaled configuration.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://lore.kernel.org/r/20211201225140.2481577-3-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <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 d77eb7da5dafce5fb0f31760e14a1d6a8414bd81..7235605bfc9ea0d549074b056dff4d4e4a8e3aa3 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
@@ -413,13 +413,11 @@ static void dpu_hw_sspp_setup_pe_config(struct dpu_hw_pipe *ctx,
 
 static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_pipe *ctx,
                struct dpu_hw_pipe_cfg *sspp,
-               struct dpu_hw_pixel_ext *pe,
                void *scaler_cfg)
 {
        u32 idx;
        struct dpu_hw_scaler3_cfg *scaler3_cfg = scaler_cfg;
 
-       (void)pe;
        if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp
                || !scaler3_cfg)
                return;

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 e8939d7387cb7f8ecaf1488bdb1f36b907c0f820..ad2002d75739475a454c0a677897bb55da28761d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
@@ -334,12 +334,10 @@ struct dpu_hw_sspp_ops {
         * setup_scaler - setup scaler
         * @ctx: Pointer to pipe context
         * @pipe_cfg: Pointer to pipe configuration
-        * @pe_cfg: Pointer to pixel extension configuration
         * @scaler_cfg: Pointer to scaler configuration
         */
        void (*setup_scaler)(struct dpu_hw_pipe *ctx,
                struct dpu_hw_pipe_cfg *pipe_cfg,
-               struct dpu_hw_pixel_ext *pe_cfg,
                void *scaler_cfg);
 
        /**

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 15f63180114eab78debee9ca8a8b39d0e44cb7bc..efefcc0af27a39a7b93a32ea9105e354276fd5f5 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -688,7 +688,7 @@ static void _dpu_plane_setup_scaler(struct dpu_plane *pdpu,
        if (pdpu->pipe_hw->ops.setup_scaler &&
                        pstate->multirect_index != DPU_SSPP_RECT_1)
                pdpu->pipe_hw->ops.setup_scaler(pdpu->pipe_hw,
-                               pipe_cfg, &pixel_ext,
+                               pipe_cfg,
                                &scaler3_cfg);
 }