Re: [PATCH 19/25] drm/msm/dpu: don't use unsupported blend stages

[Abhinav Kumar]

On 2/9/2022 9:25 AM, Dmitry Baryshkov wrote:

The atomic_check compares blending stage with DPU_STAGE_MAX (maximum
amount of blending stages supported by the driver), however we should
compare it against .max_mixer_blendstages, the maximum blend stage
supported by the mixer.

Signed-off-by: Dmitry Baryshkov 


This seems reasonable to me,

Reviewed-by: Abhinav Kumar 


---
  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 637d164667e9..952ff11162c0 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -927,9 +927,9 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
pstate->pipe.multirect_mode = DPU_SSPP_MULTIRECT_NONE;
  
  	pstate->stage = DPU_STAGE_0 + pstate->base.normalized_zpos;

-   if (pstate->stage >= DPU_STAGE_MAX) {
+   if (pstate->stage >= pdpu->catalog->caps->max_mixer_blendstages) {
DPU_ERROR("> %d plane stages assigned\n",
-   DPU_STAGE_MAX - DPU_STAGE_0);
+   pdpu->catalog->caps->max_mixer_blendstages - 
DPU_STAGE_0);
return -EINVAL;
}
  

[PATCH 19/25] drm/msm/dpu: don't use unsupported blend stages

[Dmitry Baryshkov]

The atomic_check compares blending stage with DPU_STAGE_MAX (maximum
amount of blending stages supported by the driver), however we should
compare it against .max_mixer_blendstages, the maximum blend stage
supported by the mixer.

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

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 637d164667e9..952ff11162c0 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -927,9 +927,9 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
pstate->pipe.multirect_mode = DPU_SSPP_MULTIRECT_NONE;
 
pstate->stage = DPU_STAGE_0 + pstate->base.normalized_zpos;
-   if (pstate->stage >= DPU_STAGE_MAX) {
+   if (pstate->stage >= pdpu->catalog->caps->max_mixer_blendstages) {
DPU_ERROR("> %d plane stages assigned\n",
-   DPU_STAGE_MAX - DPU_STAGE_0);
+   pdpu->catalog->caps->max_mixer_blendstages - 
DPU_STAGE_0);
return -EINVAL;
}
 
-- 
2.34.1