Commit d5f86e50 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: drop DPU_PLANE_QOS_VBLANK_CTRL 



Drop support for DPU_PLANE_QOS_VBLANK_CTRL flag. It is not used both
in upstream driver and in vendor SDE driver.

Reviewed-by: default avatarJeykumar Sankaran <quic_jeykumar@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/537907/
Link: https://lore.kernel.org/r/20230518222238.3815293-6-dmitry.baryshkov@linaro.org


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

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

+0 −4
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ struct dpu_caps { 
/**

 * struct dpu_sspp_sub_blks : SSPP sub-blocks

 * common: Pointer to common configurations shared by sub blocks

 * @creq_vblank: creq priority during vertical blanking

 * @danger_vblank: danger priority during vertical blanking

 * @maxdwnscale: max downscale ratio supported(without DECIMATION)

 * @maxupscale:  maxupscale ratio supported

 * @smart_dma_priority: hw priority of rect1 of multirect pipe
@@ -390,8 +388,6 @@ struct dpu_caps { 
 * @dpu_rotation_cfg: inline rotation configuration

 */

struct dpu_sspp_sub_blks {

	u32 creq_vblank;

	u32 danger_vblank;

	u32 maxdwnscale;

	u32 maxupscale;

	u32 smart_dma_priority;

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

+0 −8
Original line number Diff line number Diff line
@@ -695,14 +695,6 @@ int _dpu_hw_sspp_init_debugfs(struct dpu_hw_sspp *hw_pipe, struct dpu_kms *kms, 
			0400,

			debugfs_root,

			(u32 *) &cfg->clk_ctrl);

	debugfs_create_x32("creq_vblank",

			0600,

			debugfs_root,

			(u32 *) &sblk->creq_vblank);

	debugfs_create_x32("danger_vblank",

			0600,

			debugfs_root,

			(u32 *) &sblk->danger_vblank);



	return 0;

}

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

+0 −10
Original line number Diff line number Diff line
@@ -73,13 +73,11 @@ static const uint32_t qcom_compressed_supported_formats[] = { 
/**

 * enum dpu_plane_qos - Different qos configurations for each pipe

 *

 * @DPU_PLANE_QOS_VBLANK_CTRL: Setup VBLANK qos for the pipe.

 * @DPU_PLANE_QOS_VBLANK_AMORTIZE: Enables Amortization within pipe.

 *	this configuration is mutually exclusive from VBLANK_CTRL.

 * @DPU_PLANE_QOS_PANIC_CTRL: Setup panic for the pipe.

 */

enum dpu_plane_qos {

	DPU_PLANE_QOS_VBLANK_CTRL = BIT(0),

	DPU_PLANE_QOS_VBLANK_AMORTIZE = BIT(1),

	DPU_PLANE_QOS_PANIC_CTRL = BIT(2),

};
@@ -361,15 +359,7 @@ static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane, 


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



	if (flags & DPU_PLANE_QOS_VBLANK_CTRL) {

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

		pipe_qos_cfg.danger_vblank =

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

		pipe_qos_cfg.vblank_en = enable;

	}



	if (flags & DPU_PLANE_QOS_VBLANK_AMORTIZE) {

		/* this feature overrules previous VBLANK_CTRL */

		pipe_qos_cfg.vblank_en = false;

		pipe_qos_cfg.creq_vblank = 0; /* clear vblank bits */

	}