Stop limiting zpos property values, we use normalized_zpos anyway. And
nothing stops userspace from assigning several planes to a single zpos
(it is a userspace bug, but the kernel is forgiving about it).

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 4658410eedfb..8a8727ff7645 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -44,7 +44,6 @@
 #define DPU_NAME_SIZE  12
 
 #define DPU_PLANE_COLOR_FILL_FLAG      BIT(31)
-#define DPU_ZPOS_MAX 255
 
 /* multirect rect index */
 enum {
@@ -1375,7 +1374,6 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev,
        struct dpu_plane *pdpu;
        struct msm_drm_private *priv = dev->dev_private;
        struct dpu_kms *kms = to_dpu_kms(priv->kms);
-       int zpos_max = DPU_ZPOS_MAX;
        uint32_t num_formats;
        int ret = -EINVAL;
 
@@ -1413,14 +1411,7 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev,
 
        pdpu->catalog = kms->catalog;
 
-       if (kms->catalog->mixer_count &&
-               kms->catalog->mixer[0].sblk->maxblendstages) {
-               zpos_max = kms->catalog->mixer[0].sblk->maxblendstages - 1;
-               if (zpos_max > DPU_STAGE_MAX - DPU_STAGE_0 - 1)
-                       zpos_max = DPU_STAGE_MAX - DPU_STAGE_0 - 1;
-       }
-
-       ret = drm_plane_create_zpos_property(plane, 0, 0, zpos_max);
+       ret = drm_plane_create_zpos_property(plane, 0, 0, 255);
        if (ret)
                DPU_ERROR("failed to install zpos property, rc = %d\n", ret);
 
-- 
2.30.2

Reply via email to