[PATCH 3/6] drm/rockchip: vop: spilt register related into rockchip_reg_vop.c

[Mark Yao]

No functional updates. Spilt register related into another file
would be nice to multi vop driver,

Signed-off-by: Mark Yao 
---
 drivers/gpu/drm/rockchip/Makefile   |3 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |  325 +--
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  220 +-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c |  225 +++
 drivers/gpu/drm/rockchip/rockchip_vop_reg.h |  124 ++
 5 files changed, 468 insertions(+), 429 deletions(-)
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop_reg.c
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop_reg.h

diff --git a/drivers/gpu/drm/rockchip/Makefile 
b/drivers/gpu/drm/rockchip/Makefile
index f3d8a19..a9d380f 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -7,4 +7,5 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o 
rockchip_drm_fbdev.o \
 
 obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
 
-obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o
+obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o \
+   rockchip_vop_reg.o
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c 
b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 7674bdc..bbb781c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -36,11 +36,6 @@
 #include "rockchip_drm_fb.h"
 #include "rockchip_drm_vop.h"
 
-#define VOP_REG(off, _mask, s) \
-   {.offset = off, \
-.mask = _mask, \
-.shift = s,}
-
 #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) \
@@ -143,285 +138,6 @@ struct vop {
struct vop_win win[];
 };
 
-enum vop_data_format {
-   VOP_FMT_ARGB = 0,
-   VOP_FMT_RGB888,
-   VOP_FMT_RGB565,
-   VOP_FMT_YUV420SP = 4,
-   VOP_FMT_YUV422SP,
-   VOP_FMT_YUV444SP,
-};
-
-struct vop_reg_data {
-   uint32_t offset;
-   uint32_t value;
-};
-
-struct vop_reg {
-   uint32_t offset;
-   uint32_t shift;
-   uint32_t mask;
-};
-
-struct vop_ctrl {
-   struct vop_reg standby;
-   struct vop_reg data_blank;
-   struct vop_reg gate_en;
-   struct vop_reg mmu_en;
-   struct vop_reg rgb_en;
-   struct vop_reg edp_en;
-   struct vop_reg hdmi_en;
-   struct vop_reg mipi_en;
-   struct vop_reg out_mode;
-   struct vop_reg dither_down;
-   struct vop_reg dither_up;
-   struct vop_reg pin_pol;
-
-   struct vop_reg htotal_pw;
-   struct vop_reg hact_st_end;
-   struct vop_reg vtotal_pw;
-   struct vop_reg vact_st_end;
-   struct vop_reg hpost_st_end;
-   struct vop_reg vpost_st_end;
-
-   struct vop_reg cfg_done;
-};
-
-struct vop_intr {
-   const int *intrs;
-   uint32_t nintrs;
-   struct vop_reg enable;
-   struct vop_reg clear;
-   struct vop_reg status;
-};
-struct vop_scl_regs {
-   struct vop_reg cbcr_vsd_mode;
-   struct vop_reg cbcr_vsu_mode;
-   struct vop_reg cbcr_hsd_mode;
-   struct vop_reg cbcr_ver_scl_mode;
-   struct vop_reg cbcr_hor_scl_mode;
-   struct vop_reg yrgb_vsd_mode;
-   struct vop_reg yrgb_vsu_mode;
-   struct vop_reg yrgb_hsd_mode;
-   struct vop_reg yrgb_ver_scl_mode;
-   struct vop_reg yrgb_hor_scl_mode;
-   struct vop_reg line_load_mode;
-   struct vop_reg cbcr_axi_gather_num;
-   struct vop_reg yrgb_axi_gather_num;
-   struct vop_reg vsd_cbcr_gt2;
-   struct vop_reg vsd_cbcr_gt4;
-   struct vop_reg vsd_yrgb_gt2;
-   struct vop_reg vsd_yrgb_gt4;
-   struct vop_reg bic_coe_sel;
-   struct vop_reg cbcr_axi_gather_en;
-   struct vop_reg yrgb_axi_gather_en;
-
-   struct vop_reg lb_mode;
-   struct vop_reg scale_yrgb_x;
-   struct vop_reg scale_yrgb_y;
-   struct vop_reg scale_cbcr_x;
-   struct vop_reg scale_cbcr_y;
-};
-
-struct vop_win_phy {
-   const struct vop_scl_regs *scl;
-   const uint32_t *data_formats;
-   uint32_t nformats;
-
-   struct vop_reg enable;
-   struct vop_reg format;
-   struct vop_reg rb_swap;
-   struct vop_reg act_info;
-   struct vop_reg dsp_info;
-   struct vop_reg dsp_st;
-   struct vop_reg yrgb_mst;
-   struct vop_reg uv_mst;
-   struct vop_reg yrgb_vir;
-   struct vop_reg uv_vir;
-
-   struct vop_reg dst_alpha_ctl;
-   struct vop_reg src_alpha_ctl;
-};
-
-struct vop_win_data {
-   uint32_t base;
-   const struct vop_win_phy *phy;
-   enum drm_plane_type type;
-};
-
-struct vop_data {
-   const struct vop_reg_data *init_table;
-   unsigned int table_size;
-   const struct vop_ctrl *ctrl;
-   const struct vop_intr *intr;
-   const struct vop_win_data *win;
-   unsigned int win_size;
-};
-

[PATCH 3/6] drm/rockchip: vop: spilt register related into rockchip_reg_vop.c

[Mark Yao]

No functional updates. Spilt register related into another file
would be nice to multi vop driver,

Signed-off-by: Mark Yao 
---
 drivers/gpu/drm/rockchip/Makefile   |3 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |  325 +--
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  220 +-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c |  225 +++
 drivers/gpu/drm/rockchip/rockchip_vop_reg.h |  124 ++
 5 files changed, 468 insertions(+), 429 deletions(-)
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop_reg.c
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop_reg.h

diff --git a/drivers/gpu/drm/rockchip/Makefile 
b/drivers/gpu/drm/rockchip/Makefile
index f3d8a19..a9d380f 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -7,4 +7,5 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o 
rockchip_drm_fbdev.o \
 
 obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
 
-obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o
+obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o \
+   rockchip_vop_reg.o
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c 
b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 7674bdc..bbb781c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -36,11 +36,6 @@
 #include "rockchip_drm_fb.h"
 #include "rockchip_drm_vop.h"
 
-#define VOP_REG(off, _mask, s) \
-   {.offset = off, \
-.mask = _mask, \
-.shift = s,}
-
 #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) \
@@ -143,285 +138,6 @@ struct vop {
struct vop_win win[];
 };
 
-enum vop_data_format {
-   VOP_FMT_ARGB = 0,
-   VOP_FMT_RGB888,
-   VOP_FMT_RGB565,
-   VOP_FMT_YUV420SP = 4,
-   VOP_FMT_YUV422SP,
-   VOP_FMT_YUV444SP,
-};
-
-struct vop_reg_data {
-   uint32_t offset;
-   uint32_t value;
-};
-
-struct vop_reg {
-   uint32_t offset;
-   uint32_t shift;
-   uint32_t mask;
-};
-
-struct vop_ctrl {
-   struct vop_reg standby;
-   struct vop_reg data_blank;
-   struct vop_reg gate_en;
-   struct vop_reg mmu_en;
-   struct vop_reg rgb_en;
-   struct vop_reg edp_en;
-   struct vop_reg hdmi_en;
-   struct vop_reg mipi_en;
-   struct vop_reg out_mode;
-   struct vop_reg dither_down;
-   struct vop_reg dither_up;
-   struct vop_reg pin_pol;
-
-   struct vop_reg htotal_pw;
-   struct vop_reg hact_st_end;
-   struct vop_reg vtotal_pw;
-   struct vop_reg vact_st_end;
-   struct vop_reg hpost_st_end;
-   struct vop_reg vpost_st_end;
-
-   struct vop_reg cfg_done;
-};
-
-struct vop_intr {
-   const int *intrs;
-   uint32_t nintrs;
-   struct vop_reg enable;
-   struct vop_reg clear;
-   struct vop_reg status;
-};
-struct vop_scl_regs {
-   struct vop_reg cbcr_vsd_mode;
-   struct vop_reg cbcr_vsu_mode;
-   struct vop_reg cbcr_hsd_mode;
-   struct vop_reg cbcr_ver_scl_mode;
-   struct vop_reg cbcr_hor_scl_mode;
-   struct vop_reg yrgb_vsd_mode;
-   struct vop_reg yrgb_vsu_mode;
-   struct vop_reg yrgb_hsd_mode;
-   struct vop_reg yrgb_ver_scl_mode;
-   struct vop_reg yrgb_hor_scl_mode;
-   struct vop_reg line_load_mode;
-   struct vop_reg cbcr_axi_gather_num;
-   struct vop_reg yrgb_axi_gather_num;
-   struct vop_reg vsd_cbcr_gt2;
-   struct vop_reg vsd_cbcr_gt4;
-   struct vop_reg vsd_yrgb_gt2;
-   struct vop_reg vsd_yrgb_gt4;
-   struct vop_reg bic_coe_sel;
-   struct vop_reg cbcr_axi_gather_en;
-   struct vop_reg yrgb_axi_gather_en;
-
-   struct vop_reg lb_mode;
-   struct vop_reg scale_yrgb_x;
-   struct vop_reg scale_yrgb_y;
-   struct vop_reg scale_cbcr_x;
-   struct vop_reg scale_cbcr_y;
-};
-
-struct vop_win_phy {
-   const struct vop_scl_regs *scl;
-   const uint32_t *data_formats;
-   uint32_t nformats;
-
-   struct vop_reg enable;
-   struct vop_reg format;
-   struct vop_reg rb_swap;
-   struct vop_reg act_info;
-   struct vop_reg dsp_info;
-   struct vop_reg dsp_st;
-   struct vop_reg yrgb_mst;
-   struct vop_reg uv_mst;
-   struct vop_reg yrgb_vir;
-   struct vop_reg uv_vir;
-
-   struct vop_reg dst_alpha_ctl;
-   struct vop_reg src_alpha_ctl;
-};
-
-struct vop_win_data {
-   uint32_t base;
-   const struct vop_win_phy *phy;
-   enum drm_plane_type type;
-};
-
-struct vop_data {
-   const struct vop_reg_data *init_table;
-   unsigned int table_size;
-   const struct vop_ctrl *ctrl;
-   const struct vop_intr *intr;
-   const struct vop_win_data *win;
-   unsigned