Re: [Freedreno] [PATCH v2 7/9] drm/msm/dpu: drop DPU_PLANE_QOS_PANIC_CTRL

2023-05-05 Thread Jeykumar Sankaran 




On 5/2/2023 8:05 AM, Dmitry Baryshkov wrote:

This flag is always passed to _dpu_plane_set_qos_ctrl(), so drop it and
remove corresponding conditions from the mentioned function.

Signed-off-by: Dmitry Baryshkov 
---
  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 27 +++
  1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 0ed350776775..d1443c4b2915 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -70,15 +70,6 @@ static const uint32_t qcom_compressed_supported_formats[] = {
DRM_FORMAT_P010,
  };
  
-/**

- * enum dpu_plane_qos - Different qos configurations for each pipe
- *
- * @DPU_PLANE_QOS_PANIC_CTRL: Setup panic for the pipe.
- */
-enum dpu_plane_qos {
-   DPU_PLANE_QOS_PANIC_CTRL = BIT(2),
-};
-
  /*
   * struct dpu_plane - local dpu plane structure
   * @aspace: address space pointer
@@ -349,15 +340,14 @@ static void _dpu_plane_set_danger_lut(struct drm_plane 
*plane,
   */
  static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane,
struct dpu_sw_pipe *pipe,
-   bool enable, u32 flags)
+   bool enable)
  {
struct dpu_plane *pdpu = to_dpu_plane(plane);
struct dpu_hw_pipe_qos_cfg pipe_qos_cfg;
  
  	memset(_qos_cfg, 0, sizeof(pipe_qos_cfg));
  
-	if (flags & DPU_PLANE_QOS_PANIC_CTRL)

-   pipe_qos_cfg.danger_safe_en = enable;
+   pipe_qos_cfg.danger_safe_en = enable;
  
  	if (!pdpu->is_rt_pipe)

pipe_qos_cfg.danger_safe_en = false;
@@ -1058,7 +1048,7 @@ static void dpu_plane_sspp_update_pipe(struct drm_plane 
*plane,
  
  	/* override for color fill */

if (pdpu->color_fill & DPU_PLANE_COLOR_FILL_FLAG) {
-   _dpu_plane_set_qos_ctrl(plane, pipe, false, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, pipe, false);
  
  		/* skip remaining processing on color fill */

return;
@@ -1104,8 +1094,7 @@ static void dpu_plane_sspp_update_pipe(struct drm_plane 
*plane,
_dpu_plane_set_danger_lut(plane, pipe, fmt);
_dpu_plane_set_qos_ctrl(plane, pipe,
pipe->sspp->idx != SSPP_CURSOR0 &&
-   pipe->sspp->idx != SSPP_CURSOR1,
-   DPU_PLANE_QOS_PANIC_CTRL);
+   pipe->sspp->idx != SSPP_CURSOR1);
  
  	if (pipe->sspp->idx != SSPP_CURSOR0 &&

pipe->sspp->idx != SSPP_CURSOR1)
@@ -1224,10 +1213,10 @@ static void dpu_plane_destroy(struct drm_plane *plane)
  
  	if (pdpu) {

pstate = to_dpu_plane_state(plane->state);
-   _dpu_plane_set_qos_ctrl(plane, >pipe, false, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >pipe, false);
  
  		if (pstate->r_pipe.sspp)

-   _dpu_plane_set_qos_ctrl(plane, >r_pipe, false, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >r_pipe, false);
  
  		mutex_destroy(>lock);
  
@@ -1384,9 +1373,9 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane *plane, bool enable)

return;
  
  	pm_runtime_get_sync(_kms->pdev->dev);

-   _dpu_plane_set_qos_ctrl(plane, >pipe, enable, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >pipe, enable);
if (pstate->r_pipe.sspp)
-   _dpu_plane_set_qos_ctrl(plane, >r_pipe, enable, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >r_pipe, enable);
pm_runtime_put_sync(_kms->pdev->dev);
  }
  #endif

Reviewed-by: Jeykumar Sankaran

[Freedreno] [PATCH v2 7/9] drm/msm/dpu: drop DPU_PLANE_QOS_PANIC_CTRL

2023-05-02 Thread Dmitry Baryshkov 
This flag is always passed to _dpu_plane_set_qos_ctrl(), so drop it and
remove corresponding conditions from the mentioned function.

Signed-off-by: Dmitry Baryshkov 
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 27 +++
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 0ed350776775..d1443c4b2915 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -70,15 +70,6 @@ static const uint32_t qcom_compressed_supported_formats[] = {
DRM_FORMAT_P010,
 };
 
-/**
- * enum dpu_plane_qos - Different qos configurations for each pipe
- *
- * @DPU_PLANE_QOS_PANIC_CTRL: Setup panic for the pipe.
- */
-enum dpu_plane_qos {
-   DPU_PLANE_QOS_PANIC_CTRL = BIT(2),
-};
-
 /*
  * struct dpu_plane - local dpu plane structure
  * @aspace: address space pointer
@@ -349,15 +340,14 @@ static void _dpu_plane_set_danger_lut(struct drm_plane 
*plane,
  */
 static void _dpu_plane_set_qos_ctrl(struct drm_plane *plane,
struct dpu_sw_pipe *pipe,
-   bool enable, u32 flags)
+   bool enable)
 {
struct dpu_plane *pdpu = to_dpu_plane(plane);
struct dpu_hw_pipe_qos_cfg pipe_qos_cfg;
 
memset(_qos_cfg, 0, sizeof(pipe_qos_cfg));
 
-   if (flags & DPU_PLANE_QOS_PANIC_CTRL)
-   pipe_qos_cfg.danger_safe_en = enable;
+   pipe_qos_cfg.danger_safe_en = enable;
 
if (!pdpu->is_rt_pipe)
pipe_qos_cfg.danger_safe_en = false;
@@ -1058,7 +1048,7 @@ static void dpu_plane_sspp_update_pipe(struct drm_plane 
*plane,
 
/* override for color fill */
if (pdpu->color_fill & DPU_PLANE_COLOR_FILL_FLAG) {
-   _dpu_plane_set_qos_ctrl(plane, pipe, false, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, pipe, false);
 
/* skip remaining processing on color fill */
return;
@@ -1104,8 +1094,7 @@ static void dpu_plane_sspp_update_pipe(struct drm_plane 
*plane,
_dpu_plane_set_danger_lut(plane, pipe, fmt);
_dpu_plane_set_qos_ctrl(plane, pipe,
pipe->sspp->idx != SSPP_CURSOR0 &&
-   pipe->sspp->idx != SSPP_CURSOR1,
-   DPU_PLANE_QOS_PANIC_CTRL);
+   pipe->sspp->idx != SSPP_CURSOR1);
 
if (pipe->sspp->idx != SSPP_CURSOR0 &&
pipe->sspp->idx != SSPP_CURSOR1)
@@ -1224,10 +1213,10 @@ static void dpu_plane_destroy(struct drm_plane *plane)
 
if (pdpu) {
pstate = to_dpu_plane_state(plane->state);
-   _dpu_plane_set_qos_ctrl(plane, >pipe, false, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >pipe, false);
 
if (pstate->r_pipe.sspp)
-   _dpu_plane_set_qos_ctrl(plane, >r_pipe, false, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >r_pipe, false);
 
mutex_destroy(>lock);
 
@@ -1384,9 +1373,9 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane 
*plane, bool enable)
return;
 
pm_runtime_get_sync(_kms->pdev->dev);
-   _dpu_plane_set_qos_ctrl(plane, >pipe, enable, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >pipe, enable);
if (pstate->r_pipe.sspp)
-   _dpu_plane_set_qos_ctrl(plane, >r_pipe, enable, 
DPU_PLANE_QOS_PANIC_CTRL);
+   _dpu_plane_set_qos_ctrl(plane, >r_pipe, enable);
pm_runtime_put_sync(_kms->pdev->dev);
 }
 #endif
-- 
2.39.2