Commit 6edb12d1 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: pass dpu_format to _dpu_hw_sspp_setup_scaler3() 



There is no need to pass full dpu_hw_sspp_cfg instance to
_dpu_hw_sspp_setup_scaler3, pass just struct dpu_format pointer.

Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Abhinav Kumar <quic_abhinavk@quicinc.com> # sc7280
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/527328/
Link: https://lore.kernel.org/r/20230316161653.4106395-10-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 74fd7fda

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c

+4 −5
Original line number Diff line number Diff line
@@ -419,19 +419,18 @@ static void dpu_hw_sspp_setup_pe_config(struct dpu_hw_sspp *ctx, 
}



static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_sspp *ctx,

		struct dpu_hw_sspp_cfg *sspp,

		void *scaler_cfg)

		struct dpu_hw_scaler3_cfg *scaler3_cfg,

		const struct dpu_format *format)

{

	u32 idx;

	struct dpu_hw_scaler3_cfg *scaler3_cfg = scaler_cfg;



	if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx) || !sspp

	if (_sspp_subblk_offset(ctx, DPU_SSPP_SCALER_QSEED3, &idx)

		|| !scaler3_cfg)

		return;



	dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx,

			ctx->cap->sblk->scaler_blk.version,

			sspp->layout.format);

			format);

}



static u32 _dpu_hw_sspp_get_scaler3_ver(struct dpu_hw_sspp *ctx)

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h

+4 −5
Original line number Diff line number Diff line
@@ -317,13 +317,12 @@ struct dpu_hw_sspp_ops { 


	/**

	 * setup_scaler - setup scaler

	 * @ctx: Pointer to pipe context

	 * @pipe_cfg: Pointer to pipe configuration

	 * @scaler_cfg: Pointer to scaler configuration

	 * @scaler3_cfg: Pointer to scaler configuration

	 * @format: pixel format parameters

	 */

	void (*setup_scaler)(struct dpu_hw_sspp *ctx,

		struct dpu_hw_sspp_cfg *pipe_cfg,

		void *scaler_cfg);

		struct dpu_hw_scaler3_cfg *scaler3_cfg,

		const struct dpu_format *format);



	/**

	 * get_scaler_ver - get scaler h/w version

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -678,8 +678,8 @@ static void _dpu_plane_setup_scaler(struct dpu_sw_pipe *pipe, 
	if (pipe_hw->ops.setup_scaler &&

			pipe->multirect_index != DPU_SSPP_RECT_1)

		pipe_hw->ops.setup_scaler(pipe_hw,

				pipe_cfg,

				&scaler3_cfg);

				&scaler3_cfg,

				fmt);

}



/**