video: rk322x: fix crash on suspend/resume

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

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 66aecd006d6f2d303a5ed1357cc623be2a5101f3..35aa8be4486de63ec72be6ef72466fa94856e4d4 100644 (file)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1816,6 +1816,17 @@ static void rk_fb_update_reg(struct rk_lcdc_driver *dev_drv,
        int count = 100;
        long timeout;
        int pagefault = 0;
+
+       if (dev_drv->suspend_flag == 1) {
+#ifdef H_USE_FENCE
+               sw_sync_timeline_inc(dev_drv->timeline, 1);
+#endif
+               for (i = 0; i < regs->win_num; i++) {
+                       win_data = &regs->reg_win_data[i];
+                       rk_fb_free_dma_buf(dev_drv, win_data);
+               }
+               return;
+       }
        /* acq_fence wait */
        for (i = 0; i < regs->win_num; i++) {
                win_data = &regs->reg_win_data[i];