Commit 0d06fb90 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: rename dpu_hw_sspp_cfg to dpu_sw_pipe_cfg 



As struct dpu_hw_sspp_cfg describes only the source and destination
rectangles, it is a software pipe configuration now. Rename it
accordingly.

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/527334/
Link: https://lore.kernel.org/r/20230316161653.4106395-14-dmitry.baryshkov@linaro.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static u32 _dpu_hw_sspp_get_scaler3_ver(struct dpu_hw_sspp *ctx) 
 * dpu_hw_sspp_setup_rects()

 */

static void dpu_hw_sspp_setup_rects(struct dpu_sw_pipe *pipe,

		struct dpu_hw_sspp_cfg *cfg)

		struct dpu_sw_pipe_cfg *cfg)

{

	struct dpu_hw_sspp *ctx = pipe->sspp;

	struct dpu_hw_blk_reg_map *c;

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

+3 −3
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ struct dpu_hw_pixel_ext { 
};



/**

 * struct dpu_hw_sspp_cfg : SSPP configuration

 * struct dpu_sw_pipe_cfg : software pipe configuration

 * @src_rect:  src ROI, caller takes into account the different operations

 *             such as decimation, flip etc to program this field

 * @dest_rect: destination ROI.

 */

struct dpu_hw_sspp_cfg {

struct dpu_sw_pipe_cfg {

	struct drm_rect src_rect;

	struct drm_rect dst_rect;

};
@@ -228,7 +228,7 @@ struct dpu_hw_sspp_ops { 
	 * @cfg: Pointer to pipe config structure

	 */

	void (*setup_rects)(struct dpu_sw_pipe *pipe,

			    struct dpu_hw_sspp_cfg *cfg);

			    struct dpu_sw_pipe_cfg *cfg);



	/**

	 * setup_pe - setup pipe pixel extension

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

+8 −8
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct dpu_kms *_dpu_plane_get_kms(struct drm_plane *plane) 
 */

static void _dpu_plane_calc_bw(struct drm_plane *plane,

	struct drm_framebuffer *fb,

	struct dpu_hw_sspp_cfg *pipe_cfg)

	struct dpu_sw_pipe_cfg *pipe_cfg)

{

	struct dpu_plane_state *pstate;

	struct drm_display_mode *mode;
@@ -192,7 +192,7 @@ static void _dpu_plane_calc_bw(struct drm_plane *plane, 
 * Result: Updates calculated clock in the plane state.

 * Clock equation: dst_w * v_total * fps * (src_h / dst_h)

 */

static void _dpu_plane_calc_clk(struct drm_plane *plane, struct dpu_hw_sspp_cfg *pipe_cfg)

static void _dpu_plane_calc_clk(struct drm_plane *plane, struct dpu_sw_pipe_cfg *pipe_cfg)

{

	struct dpu_plane_state *pstate;

	struct drm_display_mode *mode;
@@ -276,7 +276,7 @@ static int _dpu_plane_calc_fill_level(struct drm_plane *plane, 
 * @pipe_cfg:		Pointer to pipe configuration

 */

static void _dpu_plane_set_qos_lut(struct drm_plane *plane,

		struct drm_framebuffer *fb, struct dpu_hw_sspp_cfg *pipe_cfg)

		struct drm_framebuffer *fb, struct dpu_sw_pipe_cfg *pipe_cfg)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

	struct dpu_plane_state *pstate = to_dpu_plane_state(plane->state);
@@ -422,7 +422,7 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane, 
 * @pipe_cfg:		Pointer to pipe configuration

 */

static void _dpu_plane_set_ot_limit(struct drm_plane *plane,

		struct drm_crtc *crtc, struct dpu_hw_sspp_cfg *pipe_cfg)

		struct drm_crtc *crtc, struct dpu_sw_pipe_cfg *pipe_cfg)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

	struct dpu_plane_state *pstate = to_dpu_plane_state(plane->state);
@@ -636,7 +636,7 @@ static const struct dpu_csc_cfg *_dpu_plane_get_csc(struct dpu_plane *pdpu, cons 


static void _dpu_plane_setup_scaler(struct dpu_sw_pipe *pipe,

		const struct dpu_format *fmt, bool color_fill,

		struct dpu_hw_sspp_cfg *pipe_cfg,

		struct dpu_sw_pipe_cfg *pipe_cfg,

		unsigned int rotation)

{

	struct dpu_hw_sspp *pipe_hw = pipe->sspp;
@@ -695,7 +695,7 @@ static int _dpu_plane_color_fill(struct dpu_plane *pdpu, 
	const struct dpu_format *fmt;

	const struct drm_plane *plane = &pdpu->base;

	struct dpu_plane_state *pstate = to_dpu_plane_state(plane->state);

	struct dpu_hw_sspp_cfg pipe_cfg;

	struct dpu_sw_pipe_cfg pipe_cfg;



	DPU_DEBUG_PLANE(pdpu, "\n");
@@ -1131,9 +1131,9 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane) 
	bool is_rt_pipe;

	const struct dpu_format *fmt =

		to_dpu_format(msm_framebuffer_format(fb));

	struct dpu_hw_sspp_cfg pipe_cfg;

	struct dpu_sw_pipe_cfg pipe_cfg;



	memset(&pipe_cfg, 0, sizeof(struct dpu_hw_sspp_cfg));

	memset(&pipe_cfg, 0, sizeof(struct dpu_sw_pipe_cfg));



	_dpu_plane_set_scanout(plane, pstate, fb);