rk fb: add consider vop full mutile area for vsync register check

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / lcdc / rk3188_lcdc.c

diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
index b1eb96793a4bafcb6df2f07502b809b7209f3e4a..b689e9c33752cd0b02f25f32d7a5ddc9e6f63dcb 100755 (executable)
--- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c
@@ -1083,7 +1083,9 @@ static int rk3188_lcdc_blank(struct rk_lcdc_driver *dev_drv,
        return 0;
 }
 
-static int rk3188_lcdc_get_win_state(struct rk_lcdc_driver *dev_drv, int win_id)
+static int rk3188_lcdc_get_win_state(struct rk_lcdc_driver *dev_drv,
+                                    int win_id,
+                                    int area_id)
 {
        return 0;
 }
@@ -1414,14 +1416,14 @@ int rk3188_lcdc_poll_vblank(struct rk_lcdc_driver *dev_drv)
 }
 
 
-static int rk3188_lcdc_get_dsp_addr(struct rk_lcdc_driver *dev_drv,unsigned int *dsp_addr)
+static int rk3188_lcdc_get_dsp_addr(struct rk_lcdc_driver *dev_drv,unsigned int dsp_addr[][4])
 {
        struct lcdc_device *lcdc_dev =
            container_of(dev_drv, struct lcdc_device, driver);
 
        if(lcdc_dev->clk_on){
-               dsp_addr[0] = lcdc_readl(lcdc_dev, WIN0_YRGB_MST0);
-               dsp_addr[1] = lcdc_readl(lcdc_dev, WIN1_MST);
+               dsp_addr[0][0] = lcdc_readl(lcdc_dev, WIN0_YRGB_MST0);
+               dsp_addr[1][0] = lcdc_readl(lcdc_dev, WIN1_MST);
        }
        return 0;
 }