From c4a062eff71ec319d672052ec7b29fdbc9f6127a Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Tue, 18 Nov 2014 11:07:02 +0800 Subject: [PATCH] =?utf8?q?rk3036=20lcdc:=20=20=20=20=20=20=20=20=20If=20sa?= =?utf8?q?me=20layer=20is=20closed=20twice,=20atv=5Flayer=5Fcnt=20may=20be?= =?utf8?q?=20=20=20=20=20=20=20=20=20set=20to=20zero,=20so=20vop=20go=20to?= =?utf8?q?=20standy.=20Now=20win0=E3=80=81win1=E3=80=81hwc=20=20=20=20=20?= =?utf8?q?=20=20=20=20is=20mapped=20to=20atv=5Flayer=5Fcnt=20bit[0-2].=20W?= =?utf8?q?hen=20open/close=20=20=20=20=20=20=20=20=20layer,=20set=20coresp?= =?utf8?q?onding=20atv=5Flayer=5Fcnt=20bit=20to=20one/zero.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- drivers/video/rockchip/lcdc/rk3036_lcdc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/rockchip/lcdc/rk3036_lcdc.c b/drivers/video/rockchip/lcdc/rk3036_lcdc.c index c278bb51d82f..aeb0b353af5b 100755 --- a/drivers/video/rockchip/lcdc/rk3036_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3036_lcdc.c @@ -349,9 +349,9 @@ static void lcdc_layer_enable(struct lcdc_device *lcdc_dev, "wakeup from standby!\n"); lcdc_dev->standby = 0; } - lcdc_dev->atv_layer_cnt++; - } else if ((lcdc_dev->atv_layer_cnt > 0) && (!open)) { - lcdc_dev->atv_layer_cnt--; + lcdc_dev->atv_layer_cnt |= (1 << win_id); + } else if ((lcdc_dev->atv_layer_cnt & (1 << win_id)) && (!open)) { + lcdc_dev->atv_layer_cnt &= ~(1 << win_id); } lcdc_dev->driver.win[win_id]->state = open; if (!open) { -- 2.34.1