From: Mark Yao <mark.yao@rock-chips.com>
Date: Tue, 8 Aug 2017 08:46:20 +0000 (+0800)
Subject: drm/rockchip: vop: zpos set to INT_MAX if not enabled
X-Git-Tag: release-20171130_firefly~4^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b34356fc635d9de195f49df54efcb607024fe1b9;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: Ia78c26f400d0cc4192cae183f83b7f06575c9332
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 8d7cba2e7b79..813cdee9b428 100644
--- 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;
 	}