drm/rockchip: vop: zpos set to INT_MAX if not enabled

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / rockchip / rockchip_drm_vop.c

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 8d7cba2e7b79223a54e0471fe9c2c49426410f12..813cdee9b428d3409d5dfe5be8f6d23c463f90e1 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -2037,7 +2037,11 @@ static int vop_crtc_atomic_check(struct drm_crtc *crtc,
                if (!pstate)
                        pstate = plane->state;
                plane_state = to_vop_plane_state(pstate);
-               pzpos[cnt].zpos = plane_state->zpos;
+
+               if (!plane_state->enable)
+                       pzpos[cnt].zpos = INT_MAX;
+               else
+                       pzpos[cnt].zpos = plane_state->zpos;
                pzpos[cnt++].win_id = win->win_id;
        }