Commit 7b5c207a authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: rewrite plane's QoS-related functions to take dpu_sw_pipe and dpu_format 



Rewrite dpu_plane's QoS related functions to take struct dpu_sw_pipe and
struct dpu_format as arguments rather than fetching them from the
pstate or drm_framebuffer.

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


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

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

+47 −51
Original line number Diff line number Diff line
@@ -129,19 +129,18 @@ static struct dpu_kms *_dpu_plane_get_kms(struct drm_plane *plane) 
/**

 * _dpu_plane_calc_bw - calculate bandwidth required for a plane

 * @plane: Pointer to drm plane.

 * @fb:   Pointer to framebuffer associated with the given plane

 * @fmt: Pointer to source buffer format

 * @pipe_cfg: Pointer to pipe configuration

 * Result: Updates calculated bandwidth in the plane state.

 * BW Equation: src_w * src_h * bpp * fps * (v_total / v_dest)

 * Prefill BW Equation: line src bytes * line_time

 */

static void _dpu_plane_calc_bw(struct drm_plane *plane,

	struct drm_framebuffer *fb,

	const struct dpu_format *fmt,

	struct dpu_sw_pipe_cfg *pipe_cfg)

{

	struct dpu_plane_state *pstate;

	struct drm_display_mode *mode;

	const struct dpu_format *fmt = NULL;

	struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);

	int src_width, src_height, dst_height, fps;

	u64 plane_prefill_bw;
@@ -153,8 +152,6 @@ static void _dpu_plane_calc_bw(struct drm_plane *plane, 
	pstate = to_dpu_plane_state(plane->state);

	mode = &plane->state->crtc->mode;



	fmt = dpu_get_dpu_format_ext(fb->format->format, fb->modifier);



	src_width = drm_rect_width(&pipe_cfg->src_rect);

	src_height = drm_rect_height(&pipe_cfg->src_rect);

	dst_height = drm_rect_height(&pipe_cfg->dst_rect);
@@ -218,25 +215,25 @@ static void _dpu_plane_calc_clk(struct drm_plane *plane, struct dpu_sw_pipe_cfg 
/**

 * _dpu_plane_calc_fill_level - calculate fill level of the given source format

 * @plane:		Pointer to drm plane

 * @pipe:		Pointer to software pipe

 * @fmt:		Pointer to source buffer format

 * @src_width:		width of source buffer

 * Return: fill level corresponding to the source buffer/format or 0 if error

 */

static int _dpu_plane_calc_fill_level(struct drm_plane *plane,

		struct dpu_sw_pipe *pipe,

		const struct dpu_format *fmt, u32 src_width)

{

	struct dpu_plane *pdpu;

	struct dpu_plane_state *pstate;

	u32 fixed_buff_size;

	u32 total_fl;



	if (!fmt || !plane->state || !src_width || !fmt->bpp) {

	if (!fmt || !pipe || !src_width || !fmt->bpp) {

		DPU_ERROR("invalid arguments\n");

		return 0;

	}



	pdpu = to_dpu_plane(plane);

	pstate = to_dpu_plane_state(plane->state);

	fixed_buff_size = pdpu->catalog->caps->pixel_ram_size;



	/* FIXME: in multirect case account for the src_width of all the planes */
@@ -252,7 +249,7 @@ static int _dpu_plane_calc_fill_level(struct drm_plane *plane, 
				((src_width + 32) * fmt->bpp);

		}

	} else {

		if (pstate->pipe.multirect_mode == DPU_SSPP_MULTIRECT_PARALLEL) {

		if (pipe->multirect_mode == DPU_SSPP_MULTIRECT_PARALLEL) {

			total_fl = (fixed_buff_size / 2) * 2 /

				((src_width + 32) * fmt->bpp);

		} else {
@@ -262,7 +259,7 @@ static int _dpu_plane_calc_fill_level(struct drm_plane *plane, 
	}



	DPU_DEBUG_PLANE(pdpu, "pnum:%d fmt: %4.4s w:%u fl:%u\n",

			pdpu->pipe - SSPP_VIG0,

			pipe->sspp->idx - SSPP_VIG0,

			(char *)&fmt->base.pixel_format,

			src_width, total_fl);
@@ -272,25 +269,22 @@ static int _dpu_plane_calc_fill_level(struct drm_plane *plane, 
/**

 * _dpu_plane_set_qos_lut - set QoS LUT of the given plane

 * @plane:		Pointer to drm plane

 * @fb:			Pointer to framebuffer associated with the given plane

 * @pipe:		Pointer to software pipe

 * @fmt:		Pointer to source buffer format

 * @pipe_cfg:		Pointer to pipe configuration

 */

static void _dpu_plane_set_qos_lut(struct drm_plane *plane,

		struct drm_framebuffer *fb, struct dpu_sw_pipe_cfg *pipe_cfg)

		struct dpu_sw_pipe *pipe,

		const struct dpu_format *fmt, 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);

	const struct dpu_format *fmt = NULL;

	u64 qos_lut;

	u32 total_fl = 0, lut_usage;



	if (!pdpu->is_rt_pipe) {

		lut_usage = DPU_QOS_LUT_USAGE_NRT;

	} else {

		fmt = dpu_get_dpu_format_ext(

				fb->format->format,

				fb->modifier);

		total_fl = _dpu_plane_calc_fill_level(plane, fmt,

		total_fl = _dpu_plane_calc_fill_level(plane, pipe, fmt,

				drm_rect_width(&pipe_cfg->src_rect));



		if (fmt && DPU_FORMAT_IS_LINEAR(fmt))
@@ -302,7 +296,7 @@ static void _dpu_plane_set_qos_lut(struct drm_plane *plane, 
	qos_lut = _dpu_hw_get_qos_lut(

			&pdpu->catalog->perf->qos_lut_tbl[lut_usage], total_fl);



	trace_dpu_perf_set_qos_luts(pdpu->pipe - SSPP_VIG0,

	trace_dpu_perf_set_qos_luts(pipe->sspp->idx - SSPP_VIG0,

			(fmt) ? fmt->base.pixel_format : 0,

			pdpu->is_rt_pipe, total_fl, qos_lut, lut_usage);
@@ -311,20 +305,20 @@ static void _dpu_plane_set_qos_lut(struct drm_plane *plane, 
			fmt ? (char *)&fmt->base.pixel_format : NULL,

			pdpu->is_rt_pipe, total_fl, qos_lut);



	pstate->pipe.sspp->ops.setup_creq_lut(pstate->pipe.sspp, qos_lut);

	pipe->sspp->ops.setup_creq_lut(pipe->sspp, qos_lut);

}



/**

 * _dpu_plane_set_danger_lut - set danger/safe LUT of the given plane

 * @plane:		Pointer to drm plane

 * @fb:			Pointer to framebuffer associated with the given plane

 * @pipe:		Pointer to software pipe

 * @fmt:		Pointer to source buffer format

 */

static void _dpu_plane_set_danger_lut(struct drm_plane *plane,

		struct drm_framebuffer *fb)

		struct dpu_sw_pipe *pipe,

		const struct dpu_format *fmt)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

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

	const struct dpu_format *fmt = NULL;

	u32 danger_lut, safe_lut;



	if (!pdpu->is_rt_pipe) {
@@ -333,10 +327,6 @@ static void _dpu_plane_set_danger_lut(struct drm_plane *plane, 
		safe_lut = pdpu->catalog->perf->safe_lut_tbl

				[DPU_QOS_LUT_USAGE_NRT];

	} else {

		fmt = dpu_get_dpu_format_ext(

				fb->format->format,

				fb->modifier);



		if (fmt && DPU_FORMAT_IS_LINEAR(fmt)) {

			danger_lut = pdpu->catalog->perf->danger_lut_tbl

					[DPU_QOS_LUT_USAGE_LINEAR];
@@ -363,29 +353,30 @@ static void _dpu_plane_set_danger_lut(struct drm_plane *plane, 
		danger_lut,

		safe_lut);



	pstate->pipe.sspp->ops.setup_danger_safe_lut(pstate->pipe.sspp,

	pipe->sspp->ops.setup_danger_safe_lut(pipe->sspp,

			danger_lut, safe_lut);

}



/**

 * _dpu_plane_set_qos_ctrl - set QoS control of the given plane

 * @plane:		Pointer to drm plane

 * @pipe:		Pointer to software pipe

 * @enable:		true to enable QoS control

 * @flags:		QoS control mode (enum dpu_plane_qos)

 */

static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane,

	struct dpu_sw_pipe *pipe,

	bool enable, u32 flags)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

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

	struct dpu_hw_pipe_qos_cfg pipe_qos_cfg;



	memset(&pipe_qos_cfg, 0, sizeof(pipe_qos_cfg));



	if (flags & DPU_PLANE_QOS_VBLANK_CTRL) {

		pipe_qos_cfg.creq_vblank = pstate->pipe.sspp->cap->sblk->creq_vblank;

		pipe_qos_cfg.creq_vblank = pipe->sspp->cap->sblk->creq_vblank;

		pipe_qos_cfg.danger_vblank =

				pstate->pipe.sspp->cap->sblk->danger_vblank;

				pipe->sspp->cap->sblk->danger_vblank;

		pipe_qos_cfg.vblank_en = enable;

	}
@@ -411,33 +402,34 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane, 
		pipe_qos_cfg.danger_vblank,

		pdpu->is_rt_pipe);



	pstate->pipe.sspp->ops.setup_qos_ctrl(pstate->pipe.sspp,

	pipe->sspp->ops.setup_qos_ctrl(pipe->sspp,

			&pipe_qos_cfg);

}



/**

 * _dpu_plane_set_ot_limit - set OT limit for the given plane

 * @plane:		Pointer to drm plane

 * @pipe:		Pointer to software pipe

 * @crtc:		Pointer to drm crtc

 * @pipe_cfg:		Pointer to pipe configuration

 */

static void _dpu_plane_set_ot_limit(struct drm_plane *plane,

		struct dpu_sw_pipe *pipe,

		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);

	struct dpu_vbif_set_ot_params ot_params;

	struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);



	memset(&ot_params, 0, sizeof(ot_params));

	ot_params.xin_id = pstate->pipe.sspp->cap->xin_id;

	ot_params.num = pstate->pipe.sspp->idx - SSPP_NONE;

	ot_params.xin_id = pipe->sspp->cap->xin_id;

	ot_params.num = pipe->sspp->idx - SSPP_NONE;

	ot_params.width = drm_rect_width(&pipe_cfg->src_rect);

	ot_params.height = drm_rect_height(&pipe_cfg->src_rect);

	ot_params.is_wfd = !pdpu->is_rt_pipe;

	ot_params.frame_rate = drm_mode_vrefresh(&crtc->mode);

	ot_params.vbif_idx = VBIF_RT;

	ot_params.clk_ctrl = pstate->pipe.sspp->cap->clk_ctrl;

	ot_params.clk_ctrl = pipe->sspp->cap->clk_ctrl;

	ot_params.rd = true;



	dpu_vbif_set_ot_limit(dpu_kms, &ot_params);
@@ -446,19 +438,20 @@ static void _dpu_plane_set_ot_limit(struct drm_plane *plane, 
/**

 * _dpu_plane_set_qos_remap - set vbif QoS for the given plane

 * @plane:		Pointer to drm plane

 * @pipe:		Pointer to software pipe

 */

static void _dpu_plane_set_qos_remap(struct drm_plane *plane)

static void _dpu_plane_set_qos_remap(struct drm_plane *plane,

		struct dpu_sw_pipe *pipe)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

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

	struct dpu_vbif_set_qos_params qos_params;

	struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);



	memset(&qos_params, 0, sizeof(qos_params));

	qos_params.vbif_idx = VBIF_RT;

	qos_params.clk_ctrl = pstate->pipe.sspp->cap->clk_ctrl;

	qos_params.xin_id = pstate->pipe.sspp->cap->xin_id;

	qos_params.num = pstate->pipe.sspp->idx - SSPP_VIG0;

	qos_params.clk_ctrl = pipe->sspp->cap->clk_ctrl;

	qos_params.xin_id = pipe->sspp->cap->xin_id;

	qos_params.num = pipe->sspp->idx - SSPP_VIG0;

	qos_params.is_rt = pdpu->is_rt_pipe;



	DPU_DEBUG_PLANE(pdpu, "pipe:%d vbif:%d xin:%d rt:%d, clk_ctrl:%d\n",
@@ -1145,7 +1138,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane) 
	pstate->needs_qos_remap |= (is_rt_pipe != pdpu->is_rt_pipe);

	pdpu->is_rt_pipe = is_rt_pipe;



	_dpu_plane_set_qos_ctrl(plane, false, DPU_PLANE_QOS_PANIC_CTRL);

	_dpu_plane_set_qos_ctrl(plane, pipe, false, DPU_PLANE_QOS_PANIC_CTRL);



	DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT

			", %4.4s ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src),
@@ -1214,20 +1207,20 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane) 
		}

	}



	_dpu_plane_set_qos_lut(plane, fb, &pipe_cfg);

	_dpu_plane_set_danger_lut(plane, fb);

	_dpu_plane_set_qos_lut(plane, pipe, fmt, &pipe_cfg);

	_dpu_plane_set_danger_lut(plane, pipe, fmt);



	if (plane->type != DRM_PLANE_TYPE_CURSOR) {

		_dpu_plane_set_qos_ctrl(plane, true, DPU_PLANE_QOS_PANIC_CTRL);

		_dpu_plane_set_ot_limit(plane, crtc, &pipe_cfg);

		_dpu_plane_set_qos_ctrl(plane, pipe, true, DPU_PLANE_QOS_PANIC_CTRL);

		_dpu_plane_set_ot_limit(plane, pipe, crtc, &pipe_cfg);

	}



	if (pstate->needs_qos_remap) {

		pstate->needs_qos_remap = false;

		_dpu_plane_set_qos_remap(plane);

		_dpu_plane_set_qos_remap(plane, pipe);

	}



	_dpu_plane_calc_bw(plane, fb, &pipe_cfg);

	_dpu_plane_calc_bw(plane, fmt, &pipe_cfg);



	_dpu_plane_calc_clk(plane, &pipe_cfg);

}
@@ -1264,11 +1257,13 @@ static void dpu_plane_atomic_update(struct drm_plane *plane, 
static void dpu_plane_destroy(struct drm_plane *plane)

{

	struct dpu_plane *pdpu = plane ? to_dpu_plane(plane) : NULL;

	struct dpu_plane_state *pstate;



	DPU_DEBUG_PLANE(pdpu, "\n");



	if (pdpu) {

		_dpu_plane_set_qos_ctrl(plane, false, DPU_PLANE_QOS_PANIC_CTRL);

		pstate = to_dpu_plane_state(plane->state);

		_dpu_plane_set_qos_ctrl(plane, &pstate->pipe, false, DPU_PLANE_QOS_PANIC_CTRL);



		mutex_destroy(&pdpu->lock);
@@ -1397,13 +1392,14 @@ static void dpu_plane_reset(struct drm_plane *plane) 
void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable)

{

	struct dpu_plane *pdpu = to_dpu_plane(plane);

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

	struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);



	if (!pdpu->is_rt_pipe)

		return;



	pm_runtime_get_sync(&dpu_kms->pdev->dev);

	_dpu_plane_set_qos_ctrl(plane, enable, DPU_PLANE_QOS_PANIC_CTRL);

	_dpu_plane_set_qos_ctrl(plane, &pstate->pipe, enable, DPU_PLANE_QOS_PANIC_CTRL);

	pm_runtime_put_sync(&dpu_kms->pdev->dev);

}

#endif