[Freedreno] [PATCH v2 5/9] drm/msm/dpu: drop DPU_PLANE_QOS_VBLANK_CTRL

[Jeykumar Sankaran]

On 5/2/2023 8:05 AM, Dmitry Baryshkov wrote:
> Drop support for DPU_PLANE_QOS_VBLANK_CTRL flag. It is not used both
> in upstream driver and in vendor SDE driver.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h |  4 ----
>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c    |  8 --------
>   drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c      | 10 ----------
>   3 files changed, 22 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> index b2831b45ac64..d47e7061a36b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
> @@ -371,8 +371,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
> @@ -387,8 +385,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;
> 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 731199030336..b198def5534b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
> @@ -697,14 +697,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;
>   }
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 586f089756fa..3cb891917b65 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -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 */
>   	}
Reviewed-by: Jeykumar Sankaran <quic_jeykumar at quicinc.com>