drm/rockchip: vop: rk3328: fix overlay abnormal
[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / rockchip / rockchip_drm_vop.c
index 2654e5f0a74a9aea16c8fa84dd0e9d915d2a4003..e10d272b371ccad22596be6ae1b9814ed6b5651c 100644 (file)
@@ -19,6 +19,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_plane_helper.h>
 
+#include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
 #include <linux/reset.h>
 #include <linux/delay.h>
+#include <linux/sort.h>
+#include <uapi/drm/rockchip_drm.h>
 
 #include "rockchip_drm_drv.h"
 #include "rockchip_drm_gem.h"
 #include "rockchip_drm_fb.h"
 #include "rockchip_drm_vop.h"
 
-#define __REG_SET_RELAXED(x, off, mask, shift, v) \
-               vop_mask_write_relaxed(x, off, (mask) << shift, (v) << shift)
-#define __REG_SET_NORMAL(x, off, mask, shift, v) \
-               vop_mask_write(x, off, (mask) << shift, (v) << shift)
+#define VOP_REG_SUPPORT(vop, reg) \
+               (!reg.major || (reg.major == VOP_MAJOR(vop->data->version) && \
+               reg.begin_minor <= VOP_MINOR(vop->data->version) && \
+               reg.end_minor >= VOP_MINOR(vop->data->version) && \
+               reg.mask))
 
-#define REG_SET(x, base, reg, v, mode) \
-               __REG_SET_##mode(x, base + reg.offset, reg.mask, reg.shift, v)
-#define REG_SET_MASK(x, base, reg, mask, v, mode) \
-               __REG_SET_##mode(x, base + reg.offset, mask, reg.shift, v)
+#define VOP_WIN_SUPPORT(vop, win, name) \
+               VOP_REG_SUPPORT(vop, win->phy->name)
+
+#define VOP_CTRL_SUPPORT(vop, name) \
+               VOP_REG_SUPPORT(vop, vop->data->ctrl->name)
+
+#define VOP_INTR_SUPPORT(vop, name) \
+               VOP_REG_SUPPORT(vop, vop->data->intr->name)
+
+#define __REG_SET(x, off, mask, shift, v, write_mask, relaxed) \
+               vop_mask_write(x, off, mask, shift, v, write_mask, relaxed)
+
+#define _REG_SET(vop, name, off, reg, mask, v, relaxed) \
+       do { \
+               if (VOP_REG_SUPPORT(vop, reg)) \
+                       __REG_SET(vop, off + reg.offset, mask, reg.shift, \
+                                 v, reg.write_mask, relaxed); \
+               else \
+                       dev_dbg(vop->dev, "Warning: not support "#name"\n"); \
+       } while(0)
+
+#define REG_SET(x, name, off, reg, v, relaxed) \
+               _REG_SET(x, name, off, reg, reg.mask, v, relaxed)
+#define REG_SET_MASK(x, name, off, reg, mask, v, relaxed) \
+               _REG_SET(x, name, off, reg, reg.mask & mask, v, relaxed)
 
 #define VOP_WIN_SET(x, win, name, v) \
-               REG_SET(x, win->base, win->phy->name, v, RELAXED)
+               REG_SET(x, name, win->offset, VOP_WIN_NAME(win, name), v, true)
+#define VOP_WIN_SET_EXT(x, win, ext, name, v) \
+               REG_SET(x, name, 0, win->ext->name, v, true)
 #define VOP_SCL_SET(x, win, name, v) \
-               REG_SET(x, win->base, win->phy->scl->name, v, RELAXED)
+               REG_SET(x, name, win->offset, win->phy->scl->name, v, true)
 #define VOP_SCL_SET_EXT(x, win, name, v) \
-               REG_SET(x, win->base, win->phy->scl->ext->name, v, RELAXED)
+               REG_SET(x, name, win->offset, win->phy->scl->ext->name, v, true)
+
 #define VOP_CTRL_SET(x, name, v) \
-               REG_SET(x, 0, (x)->data->ctrl->name, v, NORMAL)
+               REG_SET(x, name, 0, (x)->data->ctrl->name, v, false)
 
 #define VOP_INTR_GET(vop, name) \
                vop_read_reg(vop, 0, &vop->data->ctrl->name)
 
-#define VOP_INTR_SET(vop, name, mask, v) \
-               REG_SET_MASK(vop, 0, vop->data->intr->name, mask, v, NORMAL)
+#define VOP_INTR_SET(vop, name, v) \
+               REG_SET(vop, name, 0, vop->data->intr->name, \
+                       v, false)
+#define VOP_INTR_SET_MASK(vop, name, mask, v) \
+               REG_SET_MASK(vop, name, 0, vop->data->intr->name, \
+                            mask, v, false)
+
 #define VOP_INTR_SET_TYPE(vop, name, type, v) \
        do { \
                int i, reg = 0, mask = 0; \
                                mask |= 1 << i; \
                        } \
                } \
-               VOP_INTR_SET(vop, name, mask, reg); \
+               VOP_INTR_SET_MASK(vop, name, mask, reg); \
        } while (0)
 #define VOP_INTR_GET_TYPE(vop, name, type) \
                vop_get_intr_type(vop, &vop->data->intr->name, type)
 
+#define VOP_CTRL_GET(x, name) \
+               vop_read_reg(x, 0, &vop->data->ctrl->name)
+
 #define VOP_WIN_GET(x, win, name) \
-               vop_read_reg(x, win->base, &win->phy->name)
+               vop_read_reg(x, win->offset, &VOP_WIN_NAME(win, name))
+
+#define VOP_WIN_NAME(win, name) \
+               (vop_get_win_phy(win, &win->phy->name)->name)
 
 #define VOP_WIN_GET_YRGBADDR(vop, win) \
-               vop_readl(vop, win->base + win->phy->yrgb_mst.offset)
+               vop_readl(vop, win->offset + VOP_WIN_NAME(win, yrgb_mst).offset)
 
 #define to_vop(x) container_of(x, struct vop, crtc)
 #define to_vop_win(x) container_of(x, struct vop_win, base)
 #define to_vop_plane_state(x) container_of(x, struct vop_plane_state, base)
 
+struct vop_zpos {
+       int win_id;
+       int zpos;
+};
+
 struct vop_plane_state {
        struct drm_plane_state base;
        int format;
+       int zpos;
        struct drm_rect src;
        struct drm_rect dest;
        dma_addr_t yrgb_mst;
+       dma_addr_t uv_mst;
+       const uint32_t *y2r_table;
+       const uint32_t *r2r_table;
+       const uint32_t *r2y_table;
        bool enable;
 };
 
 struct vop_win {
+       struct vop_win *parent;
        struct drm_plane base;
-       const struct vop_win_data *data;
+
+       int win_id;
+       int area_id;
+       uint32_t offset;
+       enum drm_plane_type type;
+       const struct vop_win_phy *phy;
+       const struct vop_csc *csc;
+       const uint32_t *data_formats;
+       uint32_t nformats;
        struct vop *vop;
 
+       struct drm_property *rotation_prop;
        struct vop_plane_state state;
 };
 
@@ -105,16 +164,25 @@ struct vop {
        struct drm_crtc crtc;
        struct device *dev;
        struct drm_device *drm_dev;
+       struct drm_property *plane_zpos_prop;
+       struct drm_property *plane_feature_prop;
+       struct drm_property *feature_prop;
+       bool is_iommu_enabled;
+       bool is_iommu_needed;
        bool is_enabled;
 
        /* mutex vsync_ work */
        struct mutex vsync_mutex;
        bool vsync_work_pending;
+       bool loader_protect;
        struct completion dsp_hold_completion;
        struct completion wait_update_complete;
        struct drm_pending_vblank_event *event;
 
+       struct completion line_flag_completion;
+
        const struct vop_data *data;
+       int num_wins;
 
        uint32_t *regsbak;
        void __iomem *regs;
@@ -160,27 +228,34 @@ static inline uint32_t vop_read_reg(struct vop *vop, uint32_t base,
 }
 
 static inline void vop_mask_write(struct vop *vop, uint32_t offset,
-                                 uint32_t mask, uint32_t v)
+                                 uint32_t mask, uint32_t shift, uint32_t v,
+                                 bool write_mask, bool relaxed)
 {
-       if (mask) {
+       if (!mask)
+               return;
+
+       if (write_mask) {
+               v = ((v & mask) << shift) | (mask << (shift + 16));
+       } else {
                uint32_t cached_val = vop->regsbak[offset >> 2];
 
-               cached_val = (cached_val & ~mask) | v;
-               writel(cached_val, vop->regs + offset);
-               vop->regsbak[offset >> 2] = cached_val;
+               v = (cached_val & ~(mask << shift)) | ((v & mask) << shift);
+               vop->regsbak[offset >> 2] = v;
        }
+
+       if (relaxed)
+               writel_relaxed(v, vop->regs + offset);
+       else
+               writel(v, vop->regs + offset);
 }
 
-static inline void vop_mask_write_relaxed(struct vop *vop, uint32_t offset,
-                                         uint32_t mask, uint32_t v)
+static inline const struct vop_win_phy *
+vop_get_win_phy(struct vop_win *win, const struct vop_reg *reg)
 {
-       if (mask) {
-               uint32_t cached_val = vop->regsbak[offset >> 2];
+       if (!reg->mask && win->parent)
+               return win->parent->phy;
 
-               cached_val = (cached_val & ~mask) | v;
-               writel_relaxed(cached_val, vop->regs + offset);
-               vop->regsbak[offset >> 2] = cached_val;
-       }
+       return win->phy;
 }
 
 static inline uint32_t vop_get_intr_type(struct vop *vop,
@@ -197,11 +272,51 @@ static inline uint32_t vop_get_intr_type(struct vop *vop,
        return ret;
 }
 
+static void vop_load_csc_table(struct vop *vop, u32 offset, const u32 *table)
+{
+       int i;
+
+       if (!table)
+               return;
+
+       for (i = 0; i < 8; i++)
+               vop_writel(vop, offset + i * 4, table[i]);
+}
+
 static inline void vop_cfg_done(struct vop *vop)
 {
        VOP_CTRL_SET(vop, cfg_done, 1);
 }
 
+static bool vop_is_allwin_disabled(struct vop *vop)
+{
+       int i;
+
+       for (i = 0; i < vop->num_wins; i++) {
+               struct vop_win *win = &vop->win[i];
+
+               if (VOP_WIN_GET(vop, win, enable) != 0)
+                       return false;
+       }
+
+       return true;
+}
+
+static bool vop_is_cfg_done_complete(struct vop *vop)
+{
+       return VOP_CTRL_GET(vop, cfg_done) ? false : true;
+}
+
+static bool vop_fs_irq_is_active(struct vop *vop)
+{
+       return VOP_INTR_GET_TYPE(vop, status, FS_INTR);
+}
+
+static bool vop_line_flag_is_active(struct vop *vop)
+{
+       return VOP_INTR_GET_TYPE(vop, status, LINE_FLAG_INTR);
+}
+
 static bool has_rb_swapped(uint32_t format)
 {
        switch (format) {
@@ -230,10 +345,13 @@ static enum vop_data_format vop_convert_format(uint32_t format)
        case DRM_FORMAT_BGR565:
                return VOP_FMT_RGB565;
        case DRM_FORMAT_NV12:
+       case DRM_FORMAT_NV12_10:
                return VOP_FMT_YUV420SP;
        case DRM_FORMAT_NV16:
+       case DRM_FORMAT_NV16_10:
                return VOP_FMT_YUV422SP;
        case DRM_FORMAT_NV24:
+       case DRM_FORMAT_NV24_10:
                return VOP_FMT_YUV444SP;
        default:
                DRM_ERROR("unsupport format[%08x]\n", format);
@@ -241,12 +359,38 @@ static enum vop_data_format vop_convert_format(uint32_t format)
        }
 }
 
+static bool is_yuv_output(uint32_t bus_format)
+{
+       switch (bus_format) {
+       case MEDIA_BUS_FMT_YUV8_1X24:
+       case MEDIA_BUS_FMT_YUV10_1X30:
+               return true;
+       default:
+               return false;
+       }
+}
+
 static bool is_yuv_support(uint32_t format)
 {
        switch (format) {
        case DRM_FORMAT_NV12:
+       case DRM_FORMAT_NV12_10:
        case DRM_FORMAT_NV16:
+       case DRM_FORMAT_NV16_10:
        case DRM_FORMAT_NV24:
+       case DRM_FORMAT_NV24_10:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static bool is_yuv_10bit(uint32_t format)
+{
+       switch (format) {
+       case DRM_FORMAT_NV12_10:
+       case DRM_FORMAT_NV16_10:
+       case DRM_FORMAT_NV24_10:
                return true;
        default:
                return false;
@@ -295,9 +439,9 @@ static uint16_t scl_vop_cal_scale(enum scale_mode mode, uint32_t src,
        return val;
 }
 
-static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
-                            uint32_t src_w, uint32_t src_h, uint32_t dst_w,
-                            uint32_t dst_h, uint32_t pixel_format)
+static void scl_vop_cal_scl_fac(struct vop *vop, struct vop_win *win,
+                               uint32_t src_w, uint32_t src_h, uint32_t dst_w,
+                               uint32_t dst_h, uint32_t pixel_format)
 {
        uint16_t yrgb_hor_scl_mode, yrgb_ver_scl_mode;
        uint16_t cbcr_hor_scl_mode = SCALE_NONE;
@@ -310,12 +454,10 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
        uint16_t vsu_mode;
        uint16_t lb_mode;
        uint32_t val;
-       int vskiplines;
+       int vskiplines = 0;
 
-       if (dst_w > 3840) {
-               DRM_ERROR("Maximum destination width (3840) exceeded\n");
+       if (!win->phy->scl)
                return;
-       }
 
        if (!win->phy->scl->ext) {
                VOP_SCL_SET(vop, win, scale_yrgb_x,
@@ -324,9 +466,9 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
                            scl_cal_scale2(src_h, dst_h));
                if (is_yuv) {
                        VOP_SCL_SET(vop, win, scale_cbcr_x,
-                                   scl_cal_scale2(src_w, dst_w));
+                                   scl_cal_scale2(cbcr_src_w, dst_w));
                        VOP_SCL_SET(vop, win, scale_cbcr_y,
-                                   scl_cal_scale2(src_h, dst_h));
+                                   scl_cal_scale2(cbcr_src_h, dst_h));
                }
                return;
        }
@@ -381,6 +523,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
        VOP_SCL_SET_EXT(vop, win, yrgb_vsd_mode, SCALE_DOWN_BIL);
        VOP_SCL_SET_EXT(vop, win, yrgb_vsu_mode, vsu_mode);
        if (is_yuv) {
+               vskiplines = 0;
+
                val = scl_vop_cal_scale(cbcr_hor_scl_mode, cbcr_src_w,
                                        dst_w, true, 0, NULL);
                VOP_SCL_SET(vop, win, scale_cbcr_x, val);
@@ -398,15 +542,149 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
        }
 }
 
+/*
+ * rk3399 colorspace path:
+ *      Input        Win csc                     Output
+ * 1. YUV(2020)  --> Y2R->2020To709->R2Y   --> YUV_OUTPUT(601/709)
+ *    RGB        --> R2Y                  __/
+ *
+ * 2. YUV(2020)  --> bypasss               --> YUV_OUTPUT(2020)
+ *    RGB        --> 709To2020->R2Y       __/
+ *
+ * 3. YUV(2020)  --> Y2R->2020To709        --> RGB_OUTPUT(709)
+ *    RGB        --> R2Y                  __/
+ *
+ * 4. YUV(601/709)-> Y2R->709To2020->R2Y   --> YUV_OUTPUT(2020)
+ *    RGB        --> 709To2020->R2Y       __/
+ *
+ * 5. YUV(601/709)-> bypass                --> YUV_OUTPUT(709)
+ *    RGB        --> R2Y                  __/
+ *
+ * 6. YUV(601/709)-> bypass                --> YUV_OUTPUT(601)
+ *    RGB        --> R2Y(601)             __/
+ *
+ * 7. YUV        --> Y2R(709)              --> RGB_OUTPUT(709)
+ *    RGB        --> bypass               __/
+ *
+ * 8. RGB        --> 709To2020->R2Y        --> YUV_OUTPUT(2020)
+ *
+ * 9. RGB        --> R2Y(709)              --> YUV_OUTPUT(709)
+ *
+ * 10. RGB       --> R2Y(601)              --> YUV_OUTPUT(601)
+ *
+ * 11. RGB       --> bypass                --> RGB_OUTPUT(709)
+ */
+static int vop_csc_setup(const struct vop_csc_table *csc_table,
+                        bool is_input_yuv, bool is_output_yuv,
+                        int input_csc, int output_csc,
+                        const uint32_t **y2r_table,
+                        const uint32_t **r2r_table,
+                        const uint32_t **r2y_table)
+{
+       *y2r_table = NULL;
+       *r2r_table = NULL;
+       *r2y_table = NULL;
+
+       if (is_output_yuv) {
+               if (output_csc == CSC_BT2020) {
+                       if (is_input_yuv) {
+                               if (input_csc == CSC_BT2020)
+                                       return 0;
+                               *y2r_table = csc_table->y2r_bt709;
+                       }
+                       if (input_csc != CSC_BT2020)
+                               *r2r_table = csc_table->r2r_bt709_to_bt2020;
+                       *r2y_table = csc_table->r2y_bt2020;
+               } else {
+                       if (is_input_yuv && input_csc == CSC_BT2020)
+                               *y2r_table = csc_table->y2r_bt2020;
+                       if (input_csc == CSC_BT2020)
+                               *r2r_table = csc_table->r2r_bt2020_to_bt709;
+                       if (!is_input_yuv || *y2r_table) {
+                               if (output_csc == CSC_BT709)
+                                       *r2y_table = csc_table->r2y_bt709;
+                               else
+                                       *r2y_table = csc_table->r2y_bt601;
+                       }
+               }
+       } else {
+               if (!is_input_yuv)
+                       return 0;
+
+               /*
+                * is possible use bt2020 on rgb mode?
+                */
+               if (WARN_ON(output_csc == CSC_BT2020))
+                       return -EINVAL;
+
+               if (input_csc == CSC_BT2020)
+                       *y2r_table = csc_table->y2r_bt2020;
+               else if (input_csc == CSC_BT709)
+                       *y2r_table = csc_table->y2r_bt709;
+               else
+                       *y2r_table = csc_table->y2r_bt601;
+
+               if (input_csc == CSC_BT2020)
+                       /*
+                        * We don't have bt601 to bt709 table, force use bt709.
+                        */
+                       *r2r_table = csc_table->r2r_bt2020_to_bt709;
+       }
+
+       return 0;
+}
+
+static int vop_csc_atomic_check(struct drm_crtc *crtc,
+                               struct drm_crtc_state *crtc_state)
+{
+       struct vop *vop = to_vop(crtc);
+       struct drm_atomic_state *state = crtc_state->state;
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
+       const struct vop_csc_table *csc_table = vop->data->csc_table;
+       struct drm_plane_state *pstate;
+       struct drm_plane *plane;
+       bool is_input_yuv, is_output_yuv;
+       int ret;
+
+       if (!csc_table)
+               return 0;
+
+       is_output_yuv = is_yuv_output(s->bus_format);
+
+       drm_atomic_crtc_state_for_each_plane(plane, crtc_state) {
+               struct vop_plane_state *vop_plane_state;
+
+               pstate = drm_atomic_get_plane_state(state, plane);
+               if (IS_ERR(pstate))
+                       return PTR_ERR(pstate);
+               vop_plane_state = to_vop_plane_state(pstate);
+
+               if (!pstate->fb)
+                       continue;
+               is_input_yuv = is_yuv_support(pstate->fb->pixel_format);
+
+               /*
+                * TODO: force set input and output csc mode.
+                */
+               ret = vop_csc_setup(csc_table, is_input_yuv, is_output_yuv,
+                                   CSC_BT709, CSC_BT709,
+                                   &vop_plane_state->y2r_table,
+                                   &vop_plane_state->r2r_table,
+                                   &vop_plane_state->r2y_table);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 static void vop_dsp_hold_valid_irq_enable(struct vop *vop)
 {
        unsigned long flags;
 
-       if (WARN_ON(!vop->is_enabled))
-               return;
-
        spin_lock_irqsave(&vop->irq_lock, flags);
 
+       VOP_INTR_SET_TYPE(vop, clear, DSP_HOLD_VALID_INTR, 1);
        VOP_INTR_SET_TYPE(vop, enable, DSP_HOLD_VALID_INTR, 1);
 
        spin_unlock_irqrestore(&vop->irq_lock, flags);
@@ -416,107 +694,155 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop)
 {
        unsigned long flags;
 
+       spin_lock_irqsave(&vop->irq_lock, flags);
+
+       VOP_INTR_SET_TYPE(vop, enable, DSP_HOLD_VALID_INTR, 0);
+
+       spin_unlock_irqrestore(&vop->irq_lock, flags);
+}
+
+/*
+ * (1) each frame starts at the start of the Vsync pulse which is signaled by
+ *     the "FRAME_SYNC" interrupt.
+ * (2) the active data region of each frame ends at dsp_vact_end
+ * (3) we should program this same number (dsp_vact_end) into dsp_line_frag_num,
+ *      to get "LINE_FLAG" interrupt at the end of the active on screen data.
+ *
+ * VOP_INTR_CTRL0.dsp_line_frag_num = VOP_DSP_VACT_ST_END.dsp_vact_end
+ * Interrupts
+ * LINE_FLAG -------------------------------+
+ * FRAME_SYNC ----+                         |
+ *                |                         |
+ *                v                         v
+ *                | Vsync | Vbp |  Vactive  | Vfp |
+ *                        ^     ^           ^     ^
+ *                        |     |           |     |
+ *                        |     |           |     |
+ * dsp_vs_end ------------+     |           |     |   VOP_DSP_VTOTAL_VS_END
+ * dsp_vact_start --------------+           |     |   VOP_DSP_VACT_ST_END
+ * dsp_vact_end ----------------------------+     |   VOP_DSP_VACT_ST_END
+ * dsp_total -------------------------------------+   VOP_DSP_VTOTAL_VS_END
+ */
+static bool vop_line_flag_irq_is_enabled(struct vop *vop)
+{
+       uint32_t line_flag_irq;
+       unsigned long flags;
+
+       spin_lock_irqsave(&vop->irq_lock, flags);
+
+       line_flag_irq = VOP_INTR_GET_TYPE(vop, enable, LINE_FLAG_INTR);
+
+       spin_unlock_irqrestore(&vop->irq_lock, flags);
+
+       return !!line_flag_irq;
+}
+
+static void vop_line_flag_irq_enable(struct vop *vop, int line_num)
+{
+       unsigned long flags;
+
        if (WARN_ON(!vop->is_enabled))
                return;
 
        spin_lock_irqsave(&vop->irq_lock, flags);
 
-       VOP_INTR_SET_TYPE(vop, enable, DSP_HOLD_VALID_INTR, 0);
+       VOP_INTR_SET(vop, line_flag_num[0], line_num);
+       VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1);
+       VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1);
 
        spin_unlock_irqrestore(&vop->irq_lock, flags);
 }
 
-static void vop_enable(struct drm_crtc *crtc)
+static void vop_line_flag_irq_disable(struct vop *vop)
 {
-       struct vop *vop = to_vop(crtc);
-       int ret;
+       unsigned long flags;
 
-       if (vop->is_enabled)
+       if (WARN_ON(!vop->is_enabled))
                return;
 
-       ret = pm_runtime_get_sync(vop->dev);
-       if (ret < 0) {
-               dev_err(vop->dev, "failed to get pm runtime: %d\n", ret);
-               return;
-       }
+       spin_lock_irqsave(&vop->irq_lock, flags);
+
+       VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 0);
 
-       ret = clk_enable(vop->hclk);
+       spin_unlock_irqrestore(&vop->irq_lock, flags);
+}
+
+static void vop_power_enable(struct drm_crtc *crtc)
+{
+       struct vop *vop = to_vop(crtc);
+       int ret;
+
+       ret = clk_prepare_enable(vop->hclk);
        if (ret < 0) {
                dev_err(vop->dev, "failed to enable hclk - %d\n", ret);
                return;
        }
 
-       ret = clk_enable(vop->dclk);
+       ret = clk_prepare_enable(vop->dclk);
        if (ret < 0) {
                dev_err(vop->dev, "failed to enable dclk - %d\n", ret);
                goto err_disable_hclk;
        }
 
-       ret = clk_enable(vop->aclk);
+       ret = clk_prepare_enable(vop->aclk);
        if (ret < 0) {
                dev_err(vop->dev, "failed to enable aclk - %d\n", ret);
                goto err_disable_dclk;
        }
 
-       /*
-        * Slave iommu shares power, irq and clock with vop.  It was associated
-        * automatically with this master device via common driver code.
-        * Now that we have enabled the clock we attach it to the shared drm
-        * mapping.
-        */
-       ret = rockchip_drm_dma_attach_device(vop->drm_dev, vop->dev);
-       if (ret) {
-               dev_err(vop->dev, "failed to attach dma mapping, %d\n", ret);
-               goto err_disable_aclk;
+       ret = pm_runtime_get_sync(vop->dev);
+       if (ret < 0) {
+               dev_err(vop->dev, "failed to get pm runtime: %d\n", ret);
+               return;
        }
 
-       memcpy(vop->regs, vop->regsbak, vop->len);
-       /*
-        * At here, vop clock & iommu is enable, R/W vop regs would be safe.
-        */
-       vop->is_enabled = true;
-
-       spin_lock(&vop->reg_lock);
-
-       VOP_CTRL_SET(vop, standby, 0);
-
-       spin_unlock(&vop->reg_lock);
-
-       enable_irq(vop->irq);
+       memcpy(vop->regsbak, vop->regs, vop->len);
 
-       drm_crtc_vblank_on(crtc);
+       vop->is_enabled = true;
 
        return;
 
-err_disable_aclk:
-       clk_disable(vop->aclk);
 err_disable_dclk:
-       clk_disable(vop->dclk);
+       clk_disable_unprepare(vop->dclk);
 err_disable_hclk:
-       clk_disable(vop->hclk);
+       clk_disable_unprepare(vop->hclk);
 }
 
-static void vop_crtc_disable(struct drm_crtc *crtc)
+static void vop_initial(struct drm_crtc *crtc)
 {
        struct vop *vop = to_vop(crtc);
        int i;
 
-       if (!vop->is_enabled)
-               return;
+       vop_power_enable(crtc);
+
+       VOP_CTRL_SET(vop, global_regdone_en, 1);
+       VOP_CTRL_SET(vop, dsp_blank, 0);
 
        /*
-        * We need to make sure that all windows are disabled before we
-        * disable that crtc. Otherwise we might try to scan from a destroyed
+        * We need to make sure that all windows are disabled before resume
+        * the crtc. Otherwise we might try to scan from a destroyed
         * buffer later.
         */
-       for (i = 0; i < vop->data->win_size; i++) {
-               struct vop_win *vop_win = &vop->win[i];
-               const struct vop_win_data *win = vop_win->data;
-
-               spin_lock(&vop->reg_lock);
+       for (i = 0; i < vop->num_wins; i++) {
+               struct vop_win *win = &vop->win[i];
+               int channel = i * 2 + 1;
+
+               VOP_WIN_SET(vop, win, channel, (channel + 1) << 4 | channel);
+               if (win->phy->scl && win->phy->scl->ext) {
+                       VOP_SCL_SET_EXT(vop, win, yrgb_hor_scl_mode, SCALE_NONE);
+                       VOP_SCL_SET_EXT(vop, win, yrgb_ver_scl_mode, SCALE_NONE);
+                       VOP_SCL_SET_EXT(vop, win, cbcr_hor_scl_mode, SCALE_NONE);
+                       VOP_SCL_SET_EXT(vop, win, cbcr_ver_scl_mode, SCALE_NONE);
+               }
                VOP_WIN_SET(vop, win, enable, 0);
-               spin_unlock(&vop->reg_lock);
+               VOP_WIN_SET(vop, win, gate, 1);
        }
+       VOP_CTRL_SET(vop, afbdc_en, 0);
+}
+
+static void vop_crtc_disable(struct drm_crtc *crtc)
+{
+       struct vop *vop = to_vop(crtc);
 
        drm_crtc_vblank_off(crtc);
 
@@ -536,23 +862,26 @@ static void vop_crtc_disable(struct drm_crtc *crtc)
 
        spin_unlock(&vop->reg_lock);
 
-       wait_for_completion(&vop->dsp_hold_completion);
+       WARN_ON(!wait_for_completion_timeout(&vop->dsp_hold_completion,
+                                            msecs_to_jiffies(50)));
 
        vop_dsp_hold_valid_irq_disable(vop);
 
        disable_irq(vop->irq);
 
        vop->is_enabled = false;
+       if (vop->is_iommu_enabled) {
+               /*
+                * vop standby complete, so iommu detach is safe.
+                */
+               rockchip_drm_dma_detach_device(vop->drm_dev, vop->dev);
+               vop->is_iommu_enabled = false;
+       }
 
-       /*
-        * vop standby complete, so iommu detach is safe.
-        */
-       rockchip_drm_dma_detach_device(vop->drm_dev, vop->dev);
-
-       clk_disable(vop->dclk);
-       clk_disable(vop->aclk);
-       clk_disable(vop->hclk);
        pm_runtime_put(vop->dev);
+       clk_disable_unprepare(vop->dclk);
+       clk_disable_unprepare(vop->aclk);
+       clk_disable_unprepare(vop->hclk);
 }
 
 static void vop_plane_destroy(struct drm_plane *plane)
@@ -560,14 +889,32 @@ static void vop_plane_destroy(struct drm_plane *plane)
        drm_plane_cleanup(plane);
 }
 
+static int vop_plane_prepare_fb(struct drm_plane *plane,
+                               const struct drm_plane_state *new_state)
+{
+       if (plane->state->fb)
+               drm_framebuffer_reference(plane->state->fb);
+
+       return 0;
+}
+
+static void vop_plane_cleanup_fb(struct drm_plane *plane,
+                                const struct drm_plane_state *old_state)
+{
+       if (old_state->fb)
+               drm_framebuffer_unreference(old_state->fb);
+}
+
 static int vop_plane_atomic_check(struct drm_plane *plane,
                           struct drm_plane_state *state)
 {
        struct drm_crtc *crtc = state->crtc;
        struct drm_framebuffer *fb = state->fb;
-       struct vop_win *vop_win = to_vop_win(plane);
+       struct vop_win *win = to_vop_win(plane);
        struct vop_plane_state *vop_plane_state = to_vop_plane_state(state);
-       const struct vop_win_data *win = vop_win->data;
+       struct drm_crtc_state *crtc_state;
+       const struct vop_data *vop_data;
+       struct vop *vop;
        bool visible;
        int ret;
        struct drm_rect *dest = &vop_plane_state->dest;
@@ -577,6 +924,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
                                        DRM_PLANE_HELPER_NO_SCALING;
        int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
                                        DRM_PLANE_HELPER_NO_SCALING;
+       unsigned long offset;
+       dma_addr_t dma_addr;
 
        crtc = crtc ? crtc : plane->state->crtc;
        /*
@@ -584,6 +933,11 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
         */
        if (!crtc || !fb)
                goto out_disable;
+
+       crtc_state = drm_atomic_get_crtc_state(state->state, crtc);
+       if (IS_ERR(crtc_state))
+               return PTR_ERR(crtc_state);
+
        src->x1 = state->src_x;
        src->y1 = state->src_y;
        src->x2 = state->src_x + state->src_w;
@@ -595,8 +949,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
 
        clip.x1 = 0;
        clip.y1 = 0;
-       clip.x2 = crtc->mode.hdisplay;
-       clip.y2 = crtc->mode.vdisplay;
+       clip.x2 = crtc_state->mode.hdisplay;
+       clip.y2 = crtc_state->mode.vdisplay;
 
        ret = drm_plane_helper_check_update(plane, crtc, state->fb,
                                            src, dest, &clip,
@@ -613,12 +967,48 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
        if (vop_plane_state->format < 0)
                return vop_plane_state->format;
 
+       vop = to_vop(crtc);
+       vop_data = vop->data;
+
+       if (drm_rect_width(src) >> 16 > vop_data->max_input.width ||
+           drm_rect_height(src) >> 16 > vop_data->max_input.height) {
+               DRM_ERROR("Invalid source: %dx%d. max input: %dx%d\n",
+                         drm_rect_width(src) >> 16,
+                         drm_rect_height(src) >> 16,
+                         vop_data->max_input.width,
+                         vop_data->max_input.height);
+               return -EINVAL;
+       }
+
        /*
         * Src.x1 can be odd when do clip, but yuv plane start point
         * need align with 2 pixel.
         */
-       if (is_yuv_support(fb->pixel_format) && ((src->x1 >> 16) % 2))
+       if (is_yuv_support(fb->pixel_format) && ((src->x1 >> 16) % 2)) {
+               DRM_ERROR("Invalid Source: Yuv format Can't support odd xpos\n");
                return -EINVAL;
+       }
+
+       offset = (src->x1 >> 16) * drm_format_plane_bpp(fb->pixel_format, 0) / 8;
+       if (state->rotation & BIT(DRM_REFLECT_Y))
+               offset += ((src->y2 >> 16) - 1) * fb->pitches[0];
+       else
+               offset += (src->y1 >> 16) * fb->pitches[0];
+
+       dma_addr = rockchip_fb_get_dma_addr(fb, 0);
+       vop_plane_state->yrgb_mst = dma_addr + offset + fb->offsets[0];
+       if (is_yuv_support(fb->pixel_format)) {
+               int hsub = drm_format_horz_chroma_subsampling(fb->pixel_format);
+               int vsub = drm_format_vert_chroma_subsampling(fb->pixel_format);
+               int bpp = drm_format_plane_bpp(fb->pixel_format, 1);
+
+               offset = (src->x1 >> 16) * bpp / hsub / 8;
+               offset += (src->y1 >> 16) * fb->pitches[1] / vsub;
+
+               dma_addr = rockchip_fb_get_dma_addr(fb, 1);
+               dma_addr += offset + fb->offsets[1];
+               vop_plane_state->uv_mst = dma_addr;
+       }
 
        vop_plane_state->enable = true;
 
@@ -633,8 +1023,7 @@ static void vop_plane_atomic_disable(struct drm_plane *plane,
                                     struct drm_plane_state *old_state)
 {
        struct vop_plane_state *vop_plane_state = to_vop_plane_state(old_state);
-       struct vop_win *vop_win = to_vop_win(plane);
-       const struct vop_win_data *win = vop_win->data;
+       struct vop_win *win = to_vop_win(plane);
        struct vop *vop = to_vop(old_state->crtc);
 
        if (!old_state->crtc)
@@ -642,6 +1031,16 @@ static void vop_plane_atomic_disable(struct drm_plane *plane,
 
        spin_lock(&vop->reg_lock);
 
+       /*
+        * FIXUP: some of the vop scale would be abnormal after windows power
+        * on/off so deinit scale to scale_none mode.
+        */
+       if (win->phy->scl && win->phy->scl->ext) {
+               VOP_SCL_SET_EXT(vop, win, yrgb_hor_scl_mode, SCALE_NONE);
+               VOP_SCL_SET_EXT(vop, win, yrgb_ver_scl_mode, SCALE_NONE);
+               VOP_SCL_SET_EXT(vop, win, cbcr_hor_scl_mode, SCALE_NONE);
+               VOP_SCL_SET_EXT(vop, win, cbcr_ver_scl_mode, SCALE_NONE);
+       }
        VOP_WIN_SET(vop, win, enable, 0);
 
        spin_unlock(&vop->reg_lock);
@@ -654,20 +1053,20 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
 {
        struct drm_plane_state *state = plane->state;
        struct drm_crtc *crtc = state->crtc;
-       struct vop_win *vop_win = to_vop_win(plane);
+       struct vop_win *win = to_vop_win(plane);
        struct vop_plane_state *vop_plane_state = to_vop_plane_state(state);
-       const struct vop_win_data *win = vop_win->data;
-       struct vop *vop = to_vop(state->crtc);
+       struct rockchip_crtc_state *s;
+       struct vop *vop;
        struct drm_framebuffer *fb = state->fb;
        unsigned int actual_w, actual_h;
        unsigned int dsp_stx, dsp_sty;
        uint32_t act_info, dsp_info, dsp_st;
        struct drm_rect *src = &vop_plane_state->src;
        struct drm_rect *dest = &vop_plane_state->dest;
-       struct drm_gem_object *obj, *uv_obj;
-       struct rockchip_gem_object *rk_obj, *rk_uv_obj;
-       unsigned long offset;
-       dma_addr_t dma_addr;
+       const uint32_t *y2r_table = vop_plane_state->y2r_table;
+       const uint32_t *r2r_table = vop_plane_state->r2r_table;
+       const uint32_t *r2y_table = vop_plane_state->r2y_table;
+       int ymirror, xmirror;
        uint32_t val;
        bool rb_swap;
 
@@ -677,17 +1076,11 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
        if (!crtc)
                return;
 
-       if (WARN_ON(!vop->is_enabled))
-               return;
-
        if (!vop_plane_state->enable) {
                vop_plane_atomic_disable(plane, old_state);
                return;
        }
 
-       obj = rockchip_fb_get_gem_obj(fb, 0);
-       rk_obj = to_rockchip_obj(obj);
-
        actual_w = drm_rect_width(src) >> 16;
        actual_h = drm_rect_height(src) >> 16;
        act_info = (actual_h - 1) << 16 | ((actual_w - 1) & 0xffff);
@@ -699,35 +1092,28 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
        dsp_sty = dest->y1 + crtc->mode.vtotal - crtc->mode.vsync_start;
        dsp_st = dsp_sty << 16 | (dsp_stx & 0xffff);
 
-       offset = (src->x1 >> 16) * drm_format_plane_cpp(fb->pixel_format, 0);
-       offset += (src->y1 >> 16) * fb->pitches[0];
-       vop_plane_state->yrgb_mst = rk_obj->dma_addr + offset + fb->offsets[0];
+       ymirror = !!(state->rotation & BIT(DRM_REFLECT_Y));
+       xmirror = !!(state->rotation & BIT(DRM_REFLECT_X));
+
+       vop = to_vop(state->crtc);
+       s = to_rockchip_crtc_state(crtc->state);
 
        spin_lock(&vop->reg_lock);
 
+       VOP_WIN_SET(vop, win, xmirror, xmirror);
+       VOP_WIN_SET(vop, win, ymirror, ymirror);
        VOP_WIN_SET(vop, win, format, vop_plane_state->format);
        VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> 2);
        VOP_WIN_SET(vop, win, yrgb_mst, vop_plane_state->yrgb_mst);
        if (is_yuv_support(fb->pixel_format)) {
-               int hsub = drm_format_horz_chroma_subsampling(fb->pixel_format);
-               int vsub = drm_format_vert_chroma_subsampling(fb->pixel_format);
-               int bpp = drm_format_plane_cpp(fb->pixel_format, 1);
-
-               uv_obj = rockchip_fb_get_gem_obj(fb, 1);
-               rk_uv_obj = to_rockchip_obj(uv_obj);
-
-               offset = (src->x1 >> 16) * bpp / hsub;
-               offset += (src->y1 >> 16) * fb->pitches[1] / vsub;
-
-               dma_addr = rk_uv_obj->dma_addr + offset + fb->offsets[1];
                VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> 2);
-               VOP_WIN_SET(vop, win, uv_mst, dma_addr);
+               VOP_WIN_SET(vop, win, uv_mst, vop_plane_state->uv_mst);
        }
+       VOP_WIN_SET(vop, win, fmt_10, is_yuv_10bit(fb->pixel_format));
 
-       if (win->phy->scl)
-               scl_vop_cal_scl_fac(vop, win, actual_w, actual_h,
-                                   drm_rect_width(dest), drm_rect_height(dest),
-                                   fb->pixel_format);
+       scl_vop_cal_scl_fac(vop, win, actual_w, actual_h,
+                           drm_rect_width(dest), drm_rect_height(dest),
+                           fb->pixel_format);
 
        VOP_WIN_SET(vop, win, act_info, act_info);
        VOP_WIN_SET(vop, win, dsp_info, dsp_info);
@@ -736,7 +1122,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
        rb_swap = has_rb_swapped(fb->pixel_format);
        VOP_WIN_SET(vop, win, rb_swap, rb_swap);
 
-       if (is_alpha_support(fb->pixel_format)) {
+       if (is_alpha_support(fb->pixel_format) &&
+           (s->dsp_layer_sel & 0x3) != win->win_id) {
                VOP_WIN_SET(vop, win, dst_alpha_ctl,
                            DST_FACTOR_M0(ALPHA_SRC_INVERSE));
                val = SRC_ALPHA_EN(1) | SRC_COLOR_M0(ALPHA_SRC_PRE_MUL) |
@@ -745,15 +1132,29 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
                        SRC_ALPHA_CAL_M0(ALPHA_NO_SATURATION) |
                        SRC_FACTOR_M0(ALPHA_ONE);
                VOP_WIN_SET(vop, win, src_alpha_ctl, val);
+               VOP_WIN_SET(vop, win, alpha_mode, 1);
+               VOP_WIN_SET(vop, win, alpha_en, 1);
        } else {
                VOP_WIN_SET(vop, win, src_alpha_ctl, SRC_ALPHA_EN(0));
+               VOP_WIN_SET(vop, win, alpha_en, 0);
        }
 
+       if (win->csc) {
+               vop_load_csc_table(vop, win->csc->y2r_offset, y2r_table);
+               vop_load_csc_table(vop, win->csc->r2r_offset, r2r_table);
+               vop_load_csc_table(vop, win->csc->r2y_offset, r2y_table);
+               VOP_WIN_SET_EXT(vop, win, csc, y2r_en, !!y2r_table);
+               VOP_WIN_SET_EXT(vop, win, csc, r2r_en, !!r2r_table);
+               VOP_WIN_SET_EXT(vop, win, csc, r2y_en, !!r2y_table);
+       }
        VOP_WIN_SET(vop, win, enable, 1);
        spin_unlock(&vop->reg_lock);
+       vop->is_iommu_needed = true;
 }
 
 static const struct drm_plane_helper_funcs plane_helper_funcs = {
+       .prepare_fb = vop_plane_prepare_fb,
+       .cleanup_fb = vop_plane_cleanup_fb,
        .atomic_check = vop_plane_atomic_check,
        .atomic_update = vop_plane_atomic_update,
        .atomic_disable = vop_plane_atomic_disable,
@@ -761,6 +1162,7 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = {
 
 void vop_atomic_plane_reset(struct drm_plane *plane)
 {
+       struct vop_win *win = to_vop_win(plane);
        struct vop_plane_state *vop_plane_state =
                                        to_vop_plane_state(plane->state);
 
@@ -772,6 +1174,7 @@ void vop_atomic_plane_reset(struct drm_plane *plane)
        if (!vop_plane_state)
                return;
 
+       vop_plane_state->zpos = win->win_id;
        plane->state = &vop_plane_state->base;
        plane->state->plane = plane;
 }
@@ -807,25 +1210,72 @@ static void vop_atomic_plane_destroy_state(struct drm_plane *plane,
        kfree(vop_state);
 }
 
-static const struct drm_plane_funcs vop_plane_funcs = {
-       .update_plane   = drm_atomic_helper_update_plane,
-       .disable_plane  = drm_atomic_helper_disable_plane,
-       .destroy = vop_plane_destroy,
-       .reset = vop_atomic_plane_reset,
-       .atomic_duplicate_state = vop_atomic_plane_duplicate_state,
-       .atomic_destroy_state = vop_atomic_plane_destroy_state,
-};
-
-static int vop_crtc_enable_vblank(struct drm_crtc *crtc)
+static int vop_atomic_plane_set_property(struct drm_plane *plane,
+                                        struct drm_plane_state *state,
+                                        struct drm_property *property,
+                                        uint64_t val)
 {
-       struct vop *vop = to_vop(crtc);
-       unsigned long flags;
+       struct vop_win *win = to_vop_win(plane);
+       struct vop_plane_state *plane_state = to_vop_plane_state(state);
 
-       if (WARN_ON(!vop->is_enabled))
-               return -EPERM;
+       if (property == win->vop->plane_zpos_prop) {
+               plane_state->zpos = val;
+               return 0;
+       }
+
+       if (property == win->rotation_prop) {
+               state->rotation = val;
+               return 0;
+       }
+
+       DRM_ERROR("failed to set vop plane property\n");
+       return -EINVAL;
+}
+
+static int vop_atomic_plane_get_property(struct drm_plane *plane,
+                                        const struct drm_plane_state *state,
+                                        struct drm_property *property,
+                                        uint64_t *val)
+{
+       struct vop_win *win = to_vop_win(plane);
+       struct vop_plane_state *plane_state = to_vop_plane_state(state);
+
+       if (property == win->vop->plane_zpos_prop) {
+               *val = plane_state->zpos;
+               return 0;
+       }
+
+       if (property == win->rotation_prop) {
+               *val = state->rotation;
+               return 0;
+       }
+
+       DRM_ERROR("failed to get vop plane property\n");
+       return -EINVAL;
+}
+
+static const struct drm_plane_funcs vop_plane_funcs = {
+       .update_plane   = drm_atomic_helper_update_plane,
+       .disable_plane  = drm_atomic_helper_disable_plane,
+       .destroy = vop_plane_destroy,
+       .reset = vop_atomic_plane_reset,
+       .atomic_duplicate_state = vop_atomic_plane_duplicate_state,
+       .atomic_destroy_state = vop_atomic_plane_destroy_state,
+       .atomic_set_property = vop_atomic_plane_set_property,
+       .atomic_get_property = vop_atomic_plane_get_property,
+};
+
+static int vop_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+       struct vop *vop = to_vop(crtc);
+       unsigned long flags;
+
+       if (!vop->is_enabled)
+               return -EPERM;
 
        spin_lock_irqsave(&vop->irq_lock, flags);
 
+       VOP_INTR_SET_TYPE(vop, clear, FS_INTR, 1);
        VOP_INTR_SET_TYPE(vop, enable, FS_INTR, 1);
 
        spin_unlock_irqrestore(&vop->irq_lock, flags);
@@ -838,7 +1288,7 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc)
        struct vop *vop = to_vop(crtc);
        unsigned long flags;
 
-       if (WARN_ON(!vop->is_enabled))
+       if (!vop->is_enabled)
                return;
 
        spin_lock_irqsave(&vop->irq_lock, flags);
@@ -875,11 +1325,137 @@ static void vop_crtc_cancel_pending_vblank(struct drm_crtc *crtc,
        spin_unlock_irqrestore(&drm->event_lock, flags);
 }
 
+static int vop_crtc_loader_protect(struct drm_crtc *crtc, bool on)
+{
+       struct vop *vop = to_vop(crtc);
+
+       if (on == vop->loader_protect)
+               return 0;
+
+       if (on) {
+               vop_power_enable(crtc);
+               enable_irq(vop->irq);
+               drm_crtc_vblank_on(crtc);
+               vop->loader_protect = true;
+       } else {
+               vop_crtc_disable(crtc);
+
+               vop->loader_protect = false;
+       }
+
+       return 0;
+}
+
+static int vop_plane_info_dump(struct seq_file *s, struct drm_plane *plane)
+{
+       struct vop_win *win = to_vop_win(plane);
+       struct drm_plane_state *state = plane->state;
+       struct vop_plane_state *pstate = to_vop_plane_state(state);
+       struct drm_rect *src, *dest;
+       struct drm_framebuffer *fb = state->fb;
+       int i;
+
+       seq_printf(s, "    win%d-%d: %s\n", win->win_id, win->area_id,
+                  pstate->enable ? "ACTIVE" : "DISABLED");
+       if (!fb)
+               return 0;
+
+       src = &pstate->src;
+       dest = &pstate->dest;
+
+       seq_printf(s, "\tformat: %s%s\n", drm_get_format_name(fb->pixel_format),
+                  fb->modifier[0] == DRM_FORMAT_MOD_ARM_AFBC ? "[AFBC]" : "");
+       seq_printf(s, "\tzpos: %d\n", pstate->zpos);
+       seq_printf(s, "\tsrc: pos[%dx%d] rect[%dx%d]\n", src->x1 >> 16,
+                  src->y1 >> 16, drm_rect_width(src) >> 16,
+                  drm_rect_height(src) >> 16);
+       seq_printf(s, "\tdst: pos[%dx%d] rect[%dx%d]\n", dest->x1, dest->y1,
+                  drm_rect_width(dest), drm_rect_height(dest));
+
+       for (i = 0; i < drm_format_num_planes(fb->pixel_format); i++) {
+               dma_addr_t fb_addr = rockchip_fb_get_dma_addr(fb, i);
+               seq_printf(s, "\tbuf[%d]: addr: %pad pitch: %d offset: %d\n",
+                          i, &fb_addr, fb->pitches[i], fb->offsets[i]);
+       }
+
+       return 0;
+}
+
+static int vop_crtc_debugfs_dump(struct drm_crtc *crtc, struct seq_file *s)
+{
+       struct vop *vop = to_vop(crtc);
+       struct drm_crtc_state *crtc_state = crtc->state;
+       struct drm_display_mode *mode = &crtc->state->adjusted_mode;
+       struct rockchip_crtc_state *state = to_rockchip_crtc_state(crtc->state);
+       bool interlaced = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
+       struct drm_plane *plane;
+       int i;
+
+       seq_printf(s, "VOP [%s]: %s\n", dev_name(vop->dev),
+                  crtc_state->active ? "ACTIVE" : "DISABLED");
+
+       if (!crtc_state->active)
+               return 0;
+
+       seq_printf(s, "    Connector: %s\n",
+                  drm_get_connector_name(state->output_type));
+       seq_printf(s, "\tbus_format[%x] output_mode[%x]\n",
+                  state->bus_format, state->output_mode);
+       seq_printf(s, "    Display mode: %dx%d%s%d\n",
+                  mode->hdisplay, mode->vdisplay, interlaced ? "i" : "p",
+                  drm_mode_vrefresh(mode));
+       seq_printf(s, "\tclk[%d] real_clk[%d] type[%x] flag[%x]\n",
+                  mode->clock, mode->crtc_clock, mode->type, mode->flags);
+       seq_printf(s, "\tH: %d %d %d %d\n", mode->hdisplay, mode->hsync_start,
+                  mode->hsync_end, mode->htotal);
+       seq_printf(s, "\tV: %d %d %d %d\n", mode->vdisplay, mode->vsync_start,
+                  mode->vsync_end, mode->vtotal);
+
+       for (i = 0; i < vop->num_wins; i++) {
+               plane = &vop->win[i].base;
+               vop_plane_info_dump(s, plane);
+       }
+
+       return 0;
+}
+
+static enum drm_mode_status
+vop_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode,
+                   int output_type)
+{
+       struct vop *vop = to_vop(crtc);
+       const struct vop_data *vop_data = vop->data;
+       int request_clock = mode->clock;
+       int clock;
+
+       if (mode->hdisplay > vop_data->max_output.width)
+               return MODE_BAD_HVALUE;
+       if (mode->vdisplay > vop_data->max_output.height)
+               return MODE_BAD_VVALUE;
+
+       if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+               request_clock *= 2;
+       clock = clk_round_rate(vop->dclk, request_clock * 1000) / 1000;
+
+       /*
+        * Hdmi or DisplayPort request a Accurate clock.
+        */
+       if (output_type == DRM_MODE_CONNECTOR_HDMIA ||
+           output_type == DRM_MODE_CONNECTOR_DisplayPort)
+               if (clock != request_clock)
+                       return MODE_CLOCK_RANGE;
+
+       return MODE_OK;
+}
+
 static const struct rockchip_crtc_funcs private_crtc_funcs = {
+       .loader_protect = vop_crtc_loader_protect,
        .enable_vblank = vop_crtc_enable_vblank,
        .disable_vblank = vop_crtc_disable_vblank,
        .wait_for_update = vop_crtc_wait_for_update,
        .cancel_pending_vblank = vop_crtc_cancel_pending_vblank,
+       .debugfs_dump = vop_crtc_debugfs_dump,
+       .mode_valid = vop_crtc_mode_valid,
 };
 
 static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -887,9 +1463,17 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
                                struct drm_display_mode *adjusted_mode)
 {
        struct vop *vop = to_vop(crtc);
+       const struct vop_data *vop_data = vop->data;
+       int request_clock = mode->clock;
+
+       if (mode->hdisplay > vop_data->max_output.width ||
+           mode->vdisplay > vop_data->max_output.height)
+               return false;
 
-       adjusted_mode->clock =
-               clk_round_rate(vop->dclk, mode->clock * 1000) / 1000;
+       if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+               request_clock *= 2;
+       adjusted_mode->crtc_clock =
+               clk_round_rate(vop->dclk, request_clock * 1000) / 1000;
 
        return true;
 }
@@ -897,79 +1481,92 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
 static void vop_crtc_enable(struct drm_crtc *crtc)
 {
        struct vop *vop = to_vop(crtc);
+       const struct vop_data *vop_data = vop->data;
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state);
        struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode;
-       u16 hsync_len = adjusted_mode->hsync_end - adjusted_mode->hsync_start;
-       u16 hdisplay = adjusted_mode->hdisplay;
-       u16 htotal = adjusted_mode->htotal;
-       u16 hact_st = adjusted_mode->htotal - adjusted_mode->hsync_start;
+       u16 hsync_len = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
+       u16 hdisplay = adjusted_mode->crtc_hdisplay;
+       u16 htotal = adjusted_mode->crtc_htotal;
+       u16 hact_st = adjusted_mode->crtc_htotal - adjusted_mode->crtc_hsync_start;
        u16 hact_end = hact_st + hdisplay;
-       u16 vdisplay = adjusted_mode->vdisplay;
-       u16 vtotal = adjusted_mode->vtotal;
-       u16 vsync_len = adjusted_mode->vsync_end - adjusted_mode->vsync_start;
-       u16 vact_st = adjusted_mode->vtotal - adjusted_mode->vsync_start;
+       u16 vdisplay = adjusted_mode->crtc_vdisplay;
+       u16 vtotal = adjusted_mode->crtc_vtotal;
+       u16 vsync_len = adjusted_mode->crtc_vsync_end - adjusted_mode->crtc_vsync_start;
+       u16 vact_st = adjusted_mode->crtc_vtotal - adjusted_mode->crtc_vsync_start;
        u16 vact_end = vact_st + vdisplay;
        uint32_t val;
-       int type = ROCKCHIP_OUT_MODE_TYPE(adjusted_mode->private_flags);
-       int out_mode = ROCKCHIP_OUT_MODE(adjusted_mode->private_flags);
-
-       vop_enable(crtc);
-       /*
-        * If dclk rate is zero, mean that scanout is stop,
-        * we don't need wait any more.
-        */
-       if (clk_get_rate(vop->dclk)) {
-               /*
-                * Rk3288 vop timing register is immediately, when configure
-                * display timing on display time, may cause tearing.
-                *
-                * Vop standby will take effect at end of current frame,
-                * if dsp hold valid irq happen, it means standby complete.
-                *
-                * mode set:
-                *    standby and wait complete --> |----
-                *                                  | display time
-                *                                  |----
-                *                                  |---> dsp hold irq
-                *     configure display timing --> |
-                *         standby exit             |
-                *                                  | new frame start.
-                */
-
-               reinit_completion(&vop->dsp_hold_completion);
-               vop_dsp_hold_valid_irq_enable(vop);
-
-               spin_lock(&vop->reg_lock);
-
-               VOP_CTRL_SET(vop, standby, 1);
 
-               spin_unlock(&vop->reg_lock);
+       vop_initial(crtc);
 
-               wait_for_completion(&vop->dsp_hold_completion);
-
-               vop_dsp_hold_valid_irq_disable(vop);
-       }
-
-       val = 0x8;
-       val |= (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC) ? 0 : 1;
-       val |= (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC) ? 0 : (1 << 1);
+       val = BIT(DCLK_INVERT);
+       val |= (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC) ?
+                  0 : BIT(HSYNC_POSITIVE);
+       val |= (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC) ?
+                  0 : BIT(VSYNC_POSITIVE);
        VOP_CTRL_SET(vop, pin_pol, val);
-       switch(type) {
+       switch (s->output_type) {
        case DRM_MODE_CONNECTOR_LVDS:
                VOP_CTRL_SET(vop, rgb_en, 1);
+               VOP_CTRL_SET(vop, rgb_pin_pol, val);
                break;
        case DRM_MODE_CONNECTOR_eDP:
                VOP_CTRL_SET(vop, edp_en, 1);
+               VOP_CTRL_SET(vop, edp_pin_pol, val);
                break;
        case DRM_MODE_CONNECTOR_HDMIA:
                VOP_CTRL_SET(vop, hdmi_en, 1);
+               VOP_CTRL_SET(vop, hdmi_pin_pol, val);
                break;
        case DRM_MODE_CONNECTOR_DSI:
                VOP_CTRL_SET(vop, mipi_en, 1);
+               VOP_CTRL_SET(vop, mipi_pin_pol, val);
+               break;
+       case DRM_MODE_CONNECTOR_DisplayPort:
+               val &= ~BIT(DCLK_INVERT);
+               VOP_CTRL_SET(vop, dp_pin_pol, val);
+               VOP_CTRL_SET(vop, dp_en, 1);
+               break;
+       default:
+               DRM_ERROR("unsupport connector_type[%d]\n", s->output_type);
+       }
+
+       if (s->output_mode == ROCKCHIP_OUT_MODE_AAAA &&
+           !(vop_data->feature & VOP_FEATURE_OUTPUT_10BIT))
+               s->output_mode = ROCKCHIP_OUT_MODE_P888;
+
+       VOP_CTRL_SET(vop, out_mode, s->output_mode);
+       switch (s->bus_format) {
+       case MEDIA_BUS_FMT_RGB565_1X16:
+               val = DITHER_DOWN_EN(1) | DITHER_DOWN_MODE(RGB888_TO_RGB565);
+               break;
+       case MEDIA_BUS_FMT_RGB666_1X18:
+       case MEDIA_BUS_FMT_RGB666_1X24_CPADHI:
+               val = DITHER_DOWN_EN(1) | DITHER_DOWN_MODE(RGB888_TO_RGB666);
+               break;
+       case MEDIA_BUS_FMT_YUV8_1X24:
+               val = DITHER_DOWN_EN(0) | PRE_DITHER_DOWN_EN(1);
+               break;
+       case MEDIA_BUS_FMT_YUV10_1X30:
+               val = DITHER_DOWN_EN(0) | PRE_DITHER_DOWN_EN(0);
                break;
+       case MEDIA_BUS_FMT_RGB888_1X24:
        default:
-               DRM_ERROR("unsupport connector_type[%d]\n", type);
+               val = DITHER_DOWN_EN(0) | PRE_DITHER_DOWN_EN(0);
+               break;
        }
-       VOP_CTRL_SET(vop, out_mode, out_mode);
+
+       if (s->output_mode == ROCKCHIP_OUT_MODE_AAAA)
+               val |= PRE_DITHER_DOWN_EN(0);
+       else
+               val |= PRE_DITHER_DOWN_EN(1);
+       val |= DITHER_DOWN_MODE_SEL(DITHER_DOWN_ALLEGRO);
+       VOP_CTRL_SET(vop, dither_down, val);
+       VOP_CTRL_SET(vop, dclk_ddr,
+                    s->output_mode == ROCKCHIP_OUT_MODE_YUV420 ? 1 : 0);
+       VOP_CTRL_SET(vop, overlay_mode, is_yuv_output(s->bus_format));
+       VOP_CTRL_SET(vop, dsp_out_yuv, is_yuv_output(s->bus_format));
+       VOP_CTRL_SET(vop, dsp_background,
+                    is_yuv_output(s->bus_format) ? 0x20010200 : 0);
 
        VOP_CTRL_SET(vop, htotal_pw, (htotal << 16) | hsync_len);
        val = hact_st << 16;
@@ -977,32 +1574,319 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
        VOP_CTRL_SET(vop, hact_st_end, val);
        VOP_CTRL_SET(vop, hpost_st_end, val);
 
-       VOP_CTRL_SET(vop, vtotal_pw, (vtotal << 16) | vsync_len);
+       VOP_CTRL_SET(vop, vtotal_pw, (adjusted_mode->vtotal << 16) | vsync_len);
        val = vact_st << 16;
        val |= vact_end;
        VOP_CTRL_SET(vop, vact_st_end, val);
        VOP_CTRL_SET(vop, vpost_st_end, val);
+       if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {
+               u16 vact_st_f1 = vtotal + vact_st + 1;
+               u16 vact_end_f1 = vact_st_f1 + vdisplay;
+
+               val = vact_st_f1 << 16 | vact_end_f1;
+               VOP_CTRL_SET(vop, vact_st_end_f1, val);
+               VOP_CTRL_SET(vop, vpost_st_end_f1, val);
+
+               val = vtotal << 16 | (vtotal + vsync_len);
+               VOP_CTRL_SET(vop, vs_st_end_f1, val);
+               VOP_CTRL_SET(vop, dsp_interlace, 1);
+               VOP_CTRL_SET(vop, p2i_en, 1);
+       } else {
+               VOP_CTRL_SET(vop, dsp_interlace, 0);
+               VOP_CTRL_SET(vop, p2i_en, 0);
+       }
+
+       VOP_CTRL_SET(vop, core_dclk_div,
+                    !!(adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK));
 
-       clk_set_rate(vop->dclk, adjusted_mode->clock * 1000);
+       clk_set_rate(vop->dclk, adjusted_mode->crtc_clock * 1000);
 
+       vop_cfg_done(vop);
+       /*
+        * enable vop, all the register would take effect when vop exit standby
+        */
        VOP_CTRL_SET(vop, standby, 0);
+
+       enable_irq(vop->irq);
+       drm_crtc_vblank_on(crtc);
 }
 
-static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
-                                 struct drm_crtc_state *old_crtc_state)
+static int vop_zpos_cmp(const void *a, const void *b)
+{
+       struct vop_zpos *pa = (struct vop_zpos *)a;
+       struct vop_zpos *pb = (struct vop_zpos *)b;
+
+       return pa->zpos - pb->zpos;
+}
+
+static int vop_afbdc_atomic_check(struct drm_crtc *crtc,
+                                 struct drm_crtc_state *crtc_state)
 {
        struct vop *vop = to_vop(crtc);
+       const struct vop_data *vop_data = vop->data;
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
+       struct drm_atomic_state *state = crtc_state->state;
+       struct drm_plane *plane;
+       struct drm_plane_state *pstate;
+       struct vop_plane_state *plane_state;
+       struct vop_win *win;
+       int afbdc_format;
+       int i;
 
-       if (WARN_ON(!vop->is_enabled))
-               return;
+       s->afbdc_en = 0;
+
+       for_each_plane_in_state(state, plane, pstate, i) {
+               struct drm_framebuffer *fb = pstate->fb;
+               struct drm_rect *src;
+
+               win = to_vop_win(plane);
+               plane_state = to_vop_plane_state(pstate);
+
+               if (pstate->crtc != crtc || !fb)
+                       continue;
+
+               if (fb->modifier[0] != DRM_FORMAT_MOD_ARM_AFBC)
+                       continue;
+
+               if (!(vop_data->feature & VOP_FEATURE_AFBDC)) {
+                       DRM_ERROR("not support afbdc\n");
+                       return -EINVAL;
+               }
+
+               switch (plane_state->format) {
+               case VOP_FMT_ARGB8888:
+                       afbdc_format = AFBDC_FMT_U8U8U8U8;
+                       break;
+               case VOP_FMT_RGB888:
+                       afbdc_format = AFBDC_FMT_U8U8U8;
+                       break;
+               case VOP_FMT_RGB565:
+                       afbdc_format = AFBDC_FMT_RGB565;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+
+               if (s->afbdc_en) {
+                       DRM_ERROR("vop only support one afbc layer\n");
+                       return -EINVAL;
+               }
+
+               src = &plane_state->src;
+               if (src->x1 || src->y1 || fb->offsets[0]) {
+                       DRM_ERROR("win[%d] afbdc not support offset display\n",
+                                 win->win_id);
+                       DRM_ERROR("xpos=%d, ypos=%d, offset=%d\n",
+                                 src->x1, src->y1, fb->offsets[0]);
+                       return -EINVAL;
+               }
+               s->afbdc_win_format = afbdc_format;
+               s->afbdc_win_width = pstate->fb->width - 1;
+               s->afbdc_win_height = (drm_rect_height(src) >> 16) - 1;
+               s->afbdc_win_id = win->win_id;
+               s->afbdc_win_ptr = plane_state->yrgb_mst;
+               s->afbdc_en = 1;
+       }
+
+       return 0;
+}
+
+static int vop_crtc_atomic_check(struct drm_crtc *crtc,
+                                struct drm_crtc_state *crtc_state)
+{
+       struct drm_atomic_state *state = crtc_state->state;
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
+       struct vop *vop = to_vop(crtc);
+       const struct vop_data *vop_data = vop->data;
+       struct drm_plane *plane;
+       struct drm_plane_state *pstate;
+       struct vop_plane_state *plane_state;
+       struct vop_zpos *pzpos;
+       int dsp_layer_sel = 0;
+       int i, j, cnt = 0, ret = 0;
+
+       ret = vop_afbdc_atomic_check(crtc, crtc_state);
+       if (ret)
+               return ret;
+
+       ret = vop_csc_atomic_check(crtc, crtc_state);
+       if (ret)
+               return ret;
+
+       pzpos = kmalloc_array(vop_data->win_size, sizeof(*pzpos), GFP_KERNEL);
+       if (!pzpos)
+               return -ENOMEM;
+
+       for (i = 0; i < vop_data->win_size; i++) {
+               const struct vop_win_data *win_data = &vop_data->win[i];
+               struct vop_win *win;
+
+               if (!win_data->phy)
+                       continue;
+
+               for (j = 0; j < vop->num_wins; j++) {
+                       win = &vop->win[j];
+
+                       if (win->win_id == i && !win->area_id)
+                               break;
+               }
+               if (WARN_ON(j >= vop->num_wins)) {
+                       ret = -EINVAL;
+                       goto err_free_pzpos;
+               }
+
+               plane = &win->base;
+               pstate = state->plane_states[drm_plane_index(plane)];
+               /*
+                * plane might not have changed, in which case take
+                * current state:
+                */
+               if (!pstate)
+                       pstate = plane->state;
+               plane_state = to_vop_plane_state(pstate);
+               pzpos[cnt].zpos = plane_state->zpos;
+               pzpos[cnt++].win_id = win->win_id;
+       }
+
+       sort(pzpos, cnt, sizeof(pzpos[0]), vop_zpos_cmp, NULL);
+
+       for (i = 0, cnt = 0; i < vop_data->win_size; i++) {
+               const struct vop_win_data *win_data = &vop_data->win[i];
+               int shift = i * 2;
+
+               if (win_data->phy) {
+                       struct vop_zpos *zpos = &pzpos[cnt++];
+
+                       dsp_layer_sel |= zpos->win_id << shift;
+               } else {
+                       dsp_layer_sel |= i << shift;
+               }
+       }
+
+       s->dsp_layer_sel = dsp_layer_sel;
+
+err_free_pzpos:
+       kfree(pzpos);
+       return ret;
+}
+
+static void vop_post_config(struct drm_crtc *crtc)
+{
+       struct vop *vop = to_vop(crtc);
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state);
+       struct drm_display_mode *mode = &crtc->state->adjusted_mode;
+       u16 vtotal = mode->crtc_vtotal;
+       u16 hdisplay = mode->crtc_hdisplay;
+       u16 hact_st = mode->crtc_htotal - mode->crtc_hsync_start;
+       u16 vdisplay = mode->crtc_vdisplay;
+       u16 vact_st = mode->crtc_vtotal - mode->crtc_vsync_start;
+       u16 hsize = hdisplay * (s->left_margin + s->right_margin) / 200;
+       u16 vsize = vdisplay * (s->top_margin + s->bottom_margin) / 200;
+       u16 hact_end, vact_end;
+       u32 val;
+
+       hact_st += hdisplay * (100 - s->left_margin) / 200;
+       hact_end = hact_st + hsize;
+       val = hact_st << 16;
+       val |= hact_end;
+       VOP_CTRL_SET(vop, hpost_st_end, val);
+       vact_st += vdisplay * (100 - s->top_margin) / 200;
+       vact_end = vact_st + vsize;
+       val = vact_st << 16;
+       val |= vact_end;
+       VOP_CTRL_SET(vop, vpost_st_end, val);
+       val = scl_cal_scale2(vdisplay, vsize) << 16;
+       val |= scl_cal_scale2(hdisplay, hsize);
+       VOP_CTRL_SET(vop, post_scl_factor, val);
+       VOP_CTRL_SET(vop, post_scl_ctrl, 0x3);
+       if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
+               u16 vact_st_f1 = vtotal + vact_st + 1;
+               u16 vact_end_f1 = vact_st_f1 + vsize;
+
+               val = vact_st_f1 << 16 | vact_end_f1;
+               VOP_CTRL_SET(vop, vpost_st_end_f1, val);
+       }
+}
+
+static void vop_cfg_update(struct drm_crtc *crtc,
+                          struct drm_crtc_state *old_crtc_state)
+{
+       struct rockchip_crtc_state *s =
+                       to_rockchip_crtc_state(crtc->state);
+       struct vop *vop = to_vop(crtc);
 
        spin_lock(&vop->reg_lock);
 
-       vop_cfg_done(vop);
+       if (s->afbdc_en) {
+               uint32_t pic_size;
+
+               VOP_CTRL_SET(vop, afbdc_format, s->afbdc_win_format | 1 << 4);
+               VOP_CTRL_SET(vop, afbdc_hreg_block_split, 0);
+               VOP_CTRL_SET(vop, afbdc_sel, s->afbdc_win_id);
+               VOP_CTRL_SET(vop, afbdc_hdr_ptr, s->afbdc_win_ptr);
+               pic_size = (s->afbdc_win_width & 0xffff);
+               pic_size |= s->afbdc_win_height << 16;
+               VOP_CTRL_SET(vop, afbdc_pic_size, pic_size);
+       }
+
+       VOP_CTRL_SET(vop, afbdc_en, s->afbdc_en);
+       VOP_CTRL_SET(vop, dsp_layer_sel, s->dsp_layer_sel);
+       vop_post_config(crtc);
 
        spin_unlock(&vop->reg_lock);
 }
 
+static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
+                                 struct drm_crtc_state *old_crtc_state)
+{
+       struct vop *vop = to_vop(crtc);
+
+       vop_cfg_update(crtc, old_crtc_state);
+
+       if (!vop->is_iommu_enabled && vop->is_iommu_needed) {
+               bool need_wait_vblank = !vop_is_allwin_disabled(vop);
+               int ret;
+
+               if (need_wait_vblank) {
+                       bool active;
+
+                       disable_irq(vop->irq);
+                       drm_crtc_vblank_get(crtc);
+                       VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1);
+
+                       ret = readx_poll_timeout_atomic(vop_fs_irq_is_active,
+                                                       vop, active, active,
+                                                       0, 50 * 1000);
+                       if (ret)
+                               dev_err(vop->dev, "wait fs irq timeout\n");
+
+                       VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1);
+                       vop_cfg_done(vop);
+
+                       ret = readx_poll_timeout_atomic(vop_line_flag_is_active,
+                                                       vop, active, active,
+                                                       0, 50 * 1000);
+                       if (ret)
+                               dev_err(vop->dev, "wait line flag timeout\n");
+
+                       enable_irq(vop->irq);
+               }
+               ret = rockchip_drm_dma_attach_device(vop->drm_dev, vop->dev);
+               if (ret)
+                       dev_err(vop->dev, "failed to attach dma mapping, %d\n",
+                               ret);
+
+               if (need_wait_vblank) {
+                       VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 0);
+                       drm_crtc_vblank_put(crtc);
+               }
+
+               vop->is_iommu_enabled = true;
+       }
+
+       vop_cfg_done(vop);
+}
+
 static void vop_crtc_atomic_begin(struct drm_crtc *crtc,
                                  struct drm_crtc_state *old_crtc_state)
 {
@@ -1020,6 +1904,7 @@ static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = {
        .enable = vop_crtc_enable,
        .disable = vop_crtc_disable,
        .mode_fixup = vop_crtc_mode_fixup,
+       .atomic_check = vop_crtc_atomic_check,
        .atomic_flush = vop_crtc_atomic_flush,
        .atomic_begin = vop_crtc_atomic_begin,
 };
@@ -1029,40 +1914,133 @@ static void vop_crtc_destroy(struct drm_crtc *crtc)
        drm_crtc_cleanup(crtc);
 }
 
-static const struct drm_crtc_funcs vop_crtc_funcs = {
-       .set_config = drm_atomic_helper_set_config,
-       .page_flip = drm_atomic_helper_page_flip,
-       .destroy = vop_crtc_destroy,
-       .reset = drm_atomic_helper_crtc_reset,
-       .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
-};
+static void vop_crtc_reset(struct drm_crtc *crtc)
+{
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state);
+
+       if (crtc->state) {
+               __drm_atomic_helper_crtc_destroy_state(crtc, crtc->state);
+               kfree(s);
+       }
 
-static bool vop_win_pending_is_complete(struct vop_win *vop_win)
+       s = kzalloc(sizeof(*s), GFP_KERNEL);
+       if (!s)
+               return;
+       crtc->state = &s->base;
+       crtc->state->crtc = crtc;
+       s->left_margin = 100;
+       s->right_margin = 100;
+       s->top_margin = 100;
+       s->bottom_margin = 100;
+}
+
+static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc)
 {
-       struct drm_plane *plane = &vop_win->base;
-       struct vop_plane_state *state = to_vop_plane_state(plane->state);
-       dma_addr_t yrgb_mst;
+       struct rockchip_crtc_state *rockchip_state, *old_state;
+
+       old_state = to_rockchip_crtc_state(crtc->state);
+       rockchip_state = kmemdup(old_state, sizeof(*old_state), GFP_KERNEL);
+       if (!rockchip_state)
+               return NULL;
+
+       __drm_atomic_helper_crtc_duplicate_state(crtc, &rockchip_state->base);
+       return &rockchip_state->base;
+}
+
+static void vop_crtc_destroy_state(struct drm_crtc *crtc,
+                                  struct drm_crtc_state *state)
+{
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(state);
+
+       __drm_atomic_helper_crtc_destroy_state(crtc, &s->base);
+       kfree(s);
+}
+
+static int vop_crtc_atomic_get_property(struct drm_crtc *crtc,
+                                       const struct drm_crtc_state *state,
+                                       struct drm_property *property,
+                                       uint64_t *val)
+{
+       struct drm_device *drm_dev = crtc->dev;
+       struct drm_mode_config *mode_config = &drm_dev->mode_config;
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(state);
+
+       if (property == mode_config->tv_left_margin_property) {
+               *val = s->left_margin;
+               return 0;
+       }
+
+       if (property == mode_config->tv_right_margin_property) {
+               *val = s->right_margin;
+               return 0;
+       }
+
+       if (property == mode_config->tv_top_margin_property) {
+               *val = s->top_margin;
+               return 0;
+       }
+
+       if (property == mode_config->tv_bottom_margin_property) {
+               *val = s->bottom_margin;
+               return 0;
+       }
+
+       DRM_ERROR("failed to get vop crtc property\n");
+       return -EINVAL;
+}
 
-       if (!state->enable)
-               return VOP_WIN_GET(vop_win->vop, vop_win->data, enable) == 0;
+static int vop_crtc_atomic_set_property(struct drm_crtc *crtc,
+                                       struct drm_crtc_state *state,
+                                       struct drm_property *property,
+                                       uint64_t val)
+{
+       struct drm_device *drm_dev = crtc->dev;
+       struct drm_mode_config *mode_config = &drm_dev->mode_config;
+       struct rockchip_crtc_state *s = to_rockchip_crtc_state(state);
+
+       if (property == mode_config->tv_left_margin_property) {
+               s->left_margin = val;
+               return 0;
+       }
+
+       if (property == mode_config->tv_right_margin_property) {
+               s->right_margin = val;
+               return 0;
+       }
+
+       if (property == mode_config->tv_top_margin_property) {
+               s->top_margin = val;
+               return 0;
+       }
 
-       yrgb_mst = VOP_WIN_GET_YRGBADDR(vop_win->vop, vop_win->data);
+       if (property == mode_config->tv_bottom_margin_property) {
+               s->bottom_margin = val;
+               return 0;
+       }
 
-       return yrgb_mst == state->yrgb_mst;
+       DRM_ERROR("failed to set vop crtc property\n");
+       return -EINVAL;
 }
 
+static const struct drm_crtc_funcs vop_crtc_funcs = {
+       .set_config = drm_atomic_helper_set_config,
+       .page_flip = drm_atomic_helper_page_flip,
+       .destroy = vop_crtc_destroy,
+       .reset = vop_crtc_reset,
+       .atomic_get_property = vop_crtc_atomic_get_property,
+       .atomic_set_property = vop_crtc_atomic_set_property,
+       .atomic_duplicate_state = vop_crtc_duplicate_state,
+       .atomic_destroy_state = vop_crtc_destroy_state,
+};
+
 static void vop_handle_vblank(struct vop *vop)
 {
        struct drm_device *drm = vop->drm_dev;
        struct drm_crtc *crtc = &vop->crtc;
        unsigned long flags;
-       int i;
 
-       for (i = 0; i < vop->data->win_size; i++) {
-               if (!vop_win_pending_is_complete(&vop->win[i]))
-                       return;
-       }
+       if (!vop_is_cfg_done_complete(vop))
+               return;
 
        if (vop->event) {
                spin_lock_irqsave(&drm->event_lock, flags);
@@ -1108,6 +2086,12 @@ static irqreturn_t vop_isr(int irq, void *data)
                ret = IRQ_HANDLED;
        }
 
+       if (active_irqs & LINE_FLAG_INTR) {
+               complete(&vop->line_flag_completion);
+               active_irqs &= ~LINE_FLAG_INTR;
+               ret = IRQ_HANDLED;
+       }
+
        if (active_irqs & FS_INTR) {
                drm_crtc_handle_vblank(crtc);
                vop_handle_vblank(vop);
@@ -1122,14 +2106,68 @@ static irqreturn_t vop_isr(int irq, void *data)
        return ret;
 }
 
+static int vop_plane_init(struct vop *vop, struct vop_win *win,
+                         unsigned long possible_crtcs)
+{
+       struct drm_plane *share = NULL;
+       unsigned int rotations = 0;
+       struct drm_property *prop;
+       uint64_t feature = 0;
+       int ret;
+
+       if (win->parent)
+               share = &win->parent->base;
+
+       ret = drm_share_plane_init(vop->drm_dev, &win->base, share,
+                                  possible_crtcs, &vop_plane_funcs,
+                                  win->data_formats, win->nformats, win->type);
+       if (ret) {
+               DRM_ERROR("failed to initialize plane\n");
+               return ret;
+       }
+       drm_plane_helper_add(&win->base, &plane_helper_funcs);
+       drm_object_attach_property(&win->base.base,
+                                  vop->plane_zpos_prop, win->win_id);
+
+       if (VOP_WIN_SUPPORT(vop, win, xmirror))
+               rotations |= BIT(DRM_REFLECT_X);
+
+       if (VOP_WIN_SUPPORT(vop, win, ymirror))
+               rotations |= BIT(DRM_REFLECT_Y);
+
+       if (rotations) {
+               rotations |= BIT(DRM_ROTATE_0);
+               prop = drm_mode_create_rotation_property(vop->drm_dev,
+                                                        rotations);
+               if (!prop) {
+                       DRM_ERROR("failed to create zpos property\n");
+                       return -EINVAL;
+               }
+               drm_object_attach_property(&win->base.base, prop,
+                                          BIT(DRM_ROTATE_0));
+               win->rotation_prop = prop;
+       }
+       if (win->phy->scl)
+               feature |= BIT(ROCKCHIP_DRM_PLANE_FEATURE_SCALE);
+       if (VOP_WIN_SUPPORT(vop, win, src_alpha_ctl) ||
+           VOP_WIN_SUPPORT(vop, win, alpha_en))
+               feature |= BIT(ROCKCHIP_DRM_PLANE_FEATURE_ALPHA);
+
+       drm_object_attach_property(&win->base.base, vop->plane_feature_prop,
+                                  feature);
+
+       return 0;
+}
+
 static int vop_create_crtc(struct vop *vop)
 {
-       const struct vop_data *vop_data = vop->data;
        struct device *dev = vop->dev;
+       const struct vop_data *vop_data = vop->data;
        struct drm_device *drm_dev = vop->drm_dev;
        struct drm_plane *primary = NULL, *cursor = NULL, *plane, *tmp;
        struct drm_crtc *crtc = &vop->crtc;
        struct device_node *port;
+       uint64_t feature = 0;
        int ret;
        int i;
 
@@ -1138,30 +2176,23 @@ static int vop_create_crtc(struct vop *vop)
         * to pass them to drm_crtc_init_with_planes, which sets the
         * "possible_crtcs" to the newly initialized crtc.
         */
-       for (i = 0; i < vop_data->win_size; i++) {
-               struct vop_win *vop_win = &vop->win[i];
-               const struct vop_win_data *win_data = vop_win->data;
+       for (i = 0; i < vop->num_wins; i++) {
+               struct vop_win *win = &vop->win[i];
 
-               if (win_data->type != DRM_PLANE_TYPE_PRIMARY &&
-                   win_data->type != DRM_PLANE_TYPE_CURSOR)
+               if (win->type != DRM_PLANE_TYPE_PRIMARY &&
+                   win->type != DRM_PLANE_TYPE_CURSOR)
                        continue;
 
-               ret = drm_universal_plane_init(vop->drm_dev, &vop_win->base,
-                                              0, &vop_plane_funcs,
-                                              win_data->phy->data_formats,
-                                              win_data->phy->nformats,
-                                              win_data->type, NULL);
-               if (ret) {
-                       DRM_ERROR("failed to initialize plane\n");
+               ret = vop_plane_init(vop, win, 0);
+               if (ret)
                        goto err_cleanup_planes;
-               }
 
-               plane = &vop_win->base;
-               drm_plane_helper_add(plane, &plane_helper_funcs);
+               plane = &win->base;
                if (plane->type == DRM_PLANE_TYPE_PRIMARY)
                        primary = plane;
                else if (plane->type == DRM_PLANE_TYPE_CURSOR)
                        cursor = plane;
+
        }
 
        ret = drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor,
@@ -1175,25 +2206,16 @@ static int vop_create_crtc(struct vop *vop)
         * Create drm_planes for overlay windows with possible_crtcs restricted
         * to the newly created crtc.
         */
-       for (i = 0; i < vop_data->win_size; i++) {
-               struct vop_win *vop_win = &vop->win[i];
-               const struct vop_win_data *win_data = vop_win->data;
+       for (i = 0; i < vop->num_wins; i++) {
+               struct vop_win *win = &vop->win[i];
                unsigned long possible_crtcs = 1 << drm_crtc_index(crtc);
 
-               if (win_data->type != DRM_PLANE_TYPE_OVERLAY)
+               if (win->type != DRM_PLANE_TYPE_OVERLAY)
                        continue;
 
-               ret = drm_universal_plane_init(vop->drm_dev, &vop_win->base,
-                                              possible_crtcs,
-                                              &vop_plane_funcs,
-                                              win_data->phy->data_formats,
-                                              win_data->phy->nformats,
-                                              win_data->type, NULL);
-               if (ret) {
-                       DRM_ERROR("failed to initialize overlay plane\n");
+               ret = vop_plane_init(vop, win, possible_crtcs);
+               if (ret)
                        goto err_cleanup_crtc;
-               }
-               drm_plane_helper_add(&vop_win->base, &plane_helper_funcs);
        }
 
        port = of_get_child_by_name(dev->of_node, "port");
@@ -1206,11 +2228,31 @@ static int vop_create_crtc(struct vop *vop)
 
        init_completion(&vop->dsp_hold_completion);
        init_completion(&vop->wait_update_complete);
+       init_completion(&vop->line_flag_completion);
        crtc->port = port;
        rockchip_register_crtc_funcs(crtc, &private_crtc_funcs);
 
+       ret = drm_mode_create_tv_properties(drm_dev, 0, NULL);
+       if (ret)
+               goto err_unregister_crtc_funcs;
+#define VOP_ATTACH_MODE_CONFIG_PROP(prop, v) \
+       drm_object_attach_property(&crtc->base, drm_dev->mode_config.prop, v)
+
+       VOP_ATTACH_MODE_CONFIG_PROP(tv_left_margin_property, 100);
+       VOP_ATTACH_MODE_CONFIG_PROP(tv_right_margin_property, 100);
+       VOP_ATTACH_MODE_CONFIG_PROP(tv_top_margin_property, 100);
+       VOP_ATTACH_MODE_CONFIG_PROP(tv_bottom_margin_property, 100);
+#undef VOP_ATTACH_MODE_CONFIG_PROP
+
+       if (vop_data->feature & VOP_FEATURE_AFBDC)
+               feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_AFBDC);
+       drm_object_attach_property(&crtc->base, vop->feature_prop,
+                                  feature);
+
        return 0;
 
+err_unregister_crtc_funcs:
+       rockchip_unregister_crtc_funcs(crtc);
 err_cleanup_crtc:
        drm_crtc_cleanup(crtc);
 err_cleanup_planes:
@@ -1248,119 +2290,132 @@ static void vop_destroy_crtc(struct vop *vop)
        drm_crtc_cleanup(crtc);
 }
 
-static int vop_initial(struct vop *vop)
+/*
+ * Initialize the vop->win array elements.
+ */
+static int vop_win_init(struct vop *vop)
 {
        const struct vop_data *vop_data = vop->data;
-       const struct vop_reg_data *init_table = vop_data->init_table;
-       struct reset_control *ahb_rst;
-       int i, ret;
+       unsigned int i, j;
+       unsigned int num_wins = 0;
+       struct drm_property *prop;
+       static const struct drm_prop_enum_list props[] = {
+               { ROCKCHIP_DRM_PLANE_FEATURE_SCALE, "scale" },
+               { ROCKCHIP_DRM_PLANE_FEATURE_ALPHA, "alpha" },
+       };
+       static const struct drm_prop_enum_list crtc_props[] = {
+               { ROCKCHIP_DRM_CRTC_FEATURE_AFBDC, "afbdc" },
+       };
 
-       vop->hclk = devm_clk_get(vop->dev, "hclk_vop");
-       if (IS_ERR(vop->hclk)) {
-               dev_err(vop->dev, "failed to get hclk source\n");
-               return PTR_ERR(vop->hclk);
-       }
-       vop->aclk = devm_clk_get(vop->dev, "aclk_vop");
-       if (IS_ERR(vop->aclk)) {
-               dev_err(vop->dev, "failed to get aclk source\n");
-               return PTR_ERR(vop->aclk);
-       }
-       vop->dclk = devm_clk_get(vop->dev, "dclk_vop");
-       if (IS_ERR(vop->dclk)) {
-               dev_err(vop->dev, "failed to get dclk source\n");
-               return PTR_ERR(vop->dclk);
-       }
+       for (i = 0; i < vop_data->win_size; i++) {
+               struct vop_win *vop_win = &vop->win[num_wins];
+               const struct vop_win_data *win_data = &vop_data->win[i];
 
-       ret = clk_prepare(vop->dclk);
-       if (ret < 0) {
-               dev_err(vop->dev, "failed to prepare dclk\n");
-               return ret;
-       }
+               if (!win_data->phy)
+                       continue;
 
-       /* Enable both the hclk and aclk to setup the vop */
-       ret = clk_prepare_enable(vop->hclk);
-       if (ret < 0) {
-               dev_err(vop->dev, "failed to prepare/enable hclk\n");
-               goto err_unprepare_dclk;
+               vop_win->phy = win_data->phy;
+               vop_win->csc = win_data->csc;
+               vop_win->offset = win_data->base;
+               vop_win->type = win_data->type;
+               vop_win->data_formats = win_data->phy->data_formats;
+               vop_win->nformats = win_data->phy->nformats;
+               vop_win->vop = vop;
+               vop_win->win_id = i;
+               vop_win->area_id = 0;
+               num_wins++;
+
+               for (j = 0; j < win_data->area_size; j++) {
+                       struct vop_win *vop_area = &vop->win[num_wins];
+                       const struct vop_win_phy *area = win_data->area[j];
+
+                       vop_area->parent = vop_win;
+                       vop_area->offset = vop_win->offset;
+                       vop_area->phy = area;
+                       vop_area->type = DRM_PLANE_TYPE_OVERLAY;
+                       vop_area->data_formats = vop_win->data_formats;
+                       vop_area->nformats = vop_win->nformats;
+                       vop_area->vop = vop;
+                       vop_area->win_id = i;
+                       vop_area->area_id = j;
+                       num_wins++;
+               }
        }
 
-       ret = clk_prepare_enable(vop->aclk);
-       if (ret < 0) {
-               dev_err(vop->dev, "failed to prepare/enable aclk\n");
-               goto err_disable_hclk;
-       }
+       vop->num_wins = num_wins;
 
-       /*
-        * do hclk_reset, reset all vop registers.
-        */
-       ahb_rst = devm_reset_control_get(vop->dev, "ahb");
-       if (IS_ERR(ahb_rst)) {
-               dev_err(vop->dev, "failed to get ahb reset\n");
-               ret = PTR_ERR(ahb_rst);
-               goto err_disable_aclk;
+       prop = drm_property_create_range(vop->drm_dev, DRM_MODE_PROP_ATOMIC,
+                                        "ZPOS", 0, vop->data->win_size);
+       if (!prop) {
+               DRM_ERROR("failed to create zpos property\n");
+               return -EINVAL;
        }
-       reset_control_assert(ahb_rst);
-       usleep_range(10, 20);
-       reset_control_deassert(ahb_rst);
-
-       memcpy(vop->regsbak, vop->regs, vop->len);
-
-       for (i = 0; i < vop_data->table_size; i++)
-               vop_writel(vop, init_table[i].offset, init_table[i].value);
-
-       for (i = 0; i < vop_data->win_size; i++) {
-               const struct vop_win_data *win = &vop_data->win[i];
-
-               VOP_WIN_SET(vop, win, enable, 0);
+       vop->plane_zpos_prop = prop;
+
+       vop->plane_feature_prop = drm_property_create_bitmask(vop->drm_dev,
+                               DRM_MODE_PROP_IMMUTABLE, "FEATURE",
+                               props, ARRAY_SIZE(props),
+                               BIT(ROCKCHIP_DRM_PLANE_FEATURE_SCALE) |
+                               BIT(ROCKCHIP_DRM_PLANE_FEATURE_ALPHA));
+       if (!vop->plane_feature_prop) {
+               DRM_ERROR("failed to create feature property\n");
+               return -EINVAL;
        }
 
-       vop_cfg_done(vop);
-
-       /*
-        * do dclk_reset, let all config take affect.
-        */
-       vop->dclk_rst = devm_reset_control_get(vop->dev, "dclk");
-       if (IS_ERR(vop->dclk_rst)) {
-               dev_err(vop->dev, "failed to get dclk reset\n");
-               ret = PTR_ERR(vop->dclk_rst);
-               goto err_disable_aclk;
+       vop->feature_prop = drm_property_create_bitmask(vop->drm_dev,
+                               DRM_MODE_PROP_IMMUTABLE, "FEATURE",
+                               crtc_props, ARRAY_SIZE(crtc_props),
+                               BIT(ROCKCHIP_DRM_CRTC_FEATURE_AFBDC));
+       if (!vop->feature_prop) {
+               DRM_ERROR("failed to create vop feature property\n");
+               return -EINVAL;
        }
-       reset_control_assert(vop->dclk_rst);
-       usleep_range(10, 20);
-       reset_control_deassert(vop->dclk_rst);
-
-       clk_disable(vop->hclk);
-       clk_disable(vop->aclk);
-
-       vop->is_enabled = false;
 
        return 0;
-
-err_disable_aclk:
-       clk_disable_unprepare(vop->aclk);
-err_disable_hclk:
-       clk_disable_unprepare(vop->hclk);
-err_unprepare_dclk:
-       clk_unprepare(vop->dclk);
-       return ret;
 }
 
-/*
- * Initialize the vop->win array elements.
+/**
+ * rockchip_drm_wait_line_flag - acqiure the give line flag event
+ * @crtc: CRTC to enable line flag
+ * @line_num: interested line number
+ * @mstimeout: millisecond for timeout
+ *
+ * Driver would hold here until the interested line flag interrupt have
+ * happened or timeout to wait.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
  */
-static void vop_win_init(struct vop *vop)
+int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num,
+                               unsigned int mstimeout)
 {
-       const struct vop_data *vop_data = vop->data;
-       unsigned int i;
+       struct vop *vop = to_vop(crtc);
+       unsigned long jiffies_left;
 
-       for (i = 0; i < vop_data->win_size; i++) {
-               struct vop_win *vop_win = &vop->win[i];
-               const struct vop_win_data *win_data = &vop_data->win[i];
+       if (!crtc || !vop->is_enabled)
+               return -ENODEV;
 
-               vop_win->data = win_data;
-               vop_win->vop = vop;
+       if (line_num > crtc->mode.vtotal || mstimeout <= 0)
+               return -EINVAL;
+
+       if (vop_line_flag_irq_is_enabled(vop))
+               return -EBUSY;
+
+       reinit_completion(&vop->line_flag_completion);
+       vop_line_flag_irq_enable(vop, line_num);
+
+       jiffies_left = wait_for_completion_timeout(&vop->line_flag_completion,
+                                                  msecs_to_jiffies(mstimeout));
+       vop_line_flag_irq_disable(vop);
+
+       if (jiffies_left == 0) {
+               dev_err(vop->dev, "Timeout waiting for IRQ\n");
+               return -ETIMEDOUT;
        }
+
+       return 0;
 }
+EXPORT_SYMBOL(rockchip_drm_wait_line_flag);
 
 static int vop_bind(struct device *dev, struct device *master, void *data)
 {
@@ -1370,14 +2425,21 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
        struct vop *vop;
        struct resource *res;
        size_t alloc_size;
-       int ret, irq;
+       int ret, irq, i;
+       int num_wins = 0;
 
        vop_data = of_device_get_match_data(dev);
        if (!vop_data)
                return -ENODEV;
 
+       for (i = 0; i < vop_data->win_size; i++) {
+               const struct vop_win_data *win_data = &vop_data->win[i];
+
+               num_wins += win_data->area_size + 1;
+       }
+
        /* Allocate vop struct and its vop_win array */
-       alloc_size = sizeof(*vop) + sizeof(*vop->win) * vop_data->win_size;
+       alloc_size = sizeof(*vop) + sizeof(*vop->win) * num_wins;
        vop = devm_kzalloc(dev, alloc_size, GFP_KERNEL);
        if (!vop)
                return -ENOMEM;
@@ -1385,9 +2447,12 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
        vop->dev = dev;
        vop->data = vop_data;
        vop->drm_dev = drm_dev;
+       vop->num_wins = num_wins;
        dev_set_drvdata(dev, vop);
 
-       vop_win_init(vop);
+       ret = vop_win_init(vop);
+       if (ret)
+               return ret;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        vop->len = resource_size(res);
@@ -1399,10 +2464,20 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
        if (!vop->regsbak)
                return -ENOMEM;
 
-       ret = vop_initial(vop);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "cannot initial vop dev - err %d\n", ret);
-               return ret;
+       vop->hclk = devm_clk_get(vop->dev, "hclk_vop");
+       if (IS_ERR(vop->hclk)) {
+               dev_err(vop->dev, "failed to get hclk source\n");
+               return PTR_ERR(vop->hclk);
+       }
+       vop->aclk = devm_clk_get(vop->dev, "aclk_vop");
+       if (IS_ERR(vop->aclk)) {
+               dev_err(vop->dev, "failed to get aclk source\n");
+               return PTR_ERR(vop->aclk);
+       }
+       vop->dclk = devm_clk_get(vop->dev, "dclk_vop");
+       if (IS_ERR(vop->dclk)) {
+               dev_err(vop->dev, "failed to get dclk source\n");
+               return PTR_ERR(vop->dclk);
        }
 
        irq = platform_get_irq(pdev, 0);