]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/rockchip: vop: add rk3399 vop support
authorMark Yao <mark.yao@rock-chips.com>
Wed, 20 Apr 2016 06:18:16 +0000 (14:18 +0800)
committerSean Paul <seanpaul@chromium.org>
Tue, 23 Aug 2016 15:44:29 +0000 (11:44 -0400)
There are two VOP in rk3399 chip, respectively VOP_BIG and VOP_LIT.
most registers layout of this two vop is same, their framework are both
VOP_FULL, the Major differences of this two is that:

VOP_BIG max output resolution is 4096x2160.
VOP_LIT max output resolution is 2560x1600

VOP_BIG support four windows.
VOP_LIT only support two windows.

RK3399 vop register layout is similar with rk3288, so some feature
can reuse with rk3288.

Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.h

index 76ad5d5d6dd64c7889c86ef728437ac7554fc166..42ce7d03d247f63666f67321deaf35795ff943d3 100644 (file)
@@ -912,7 +912,7 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
        u16 vsync_len = adjusted_mode->vsync_end - adjusted_mode->vsync_start;
        u16 vact_st = adjusted_mode->vtotal - adjusted_mode->vsync_start;
        u16 vact_end = vact_st + vdisplay;
-       uint32_t val;
+       uint32_t pin_pol, val;
 
        WARN_ON(vop->event);
 
@@ -953,21 +953,26 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
                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);
-       VOP_CTRL_SET(vop, pin_pol, val);
+       pin_pol = 0x8;
+       pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC) ? 0 : 1;
+       pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC) ? 0 : (1 << 1);
+       VOP_CTRL_SET(vop, pin_pol, pin_pol);
+
        switch (s->output_type) {
        case DRM_MODE_CONNECTOR_LVDS:
                VOP_CTRL_SET(vop, rgb_en, 1);
+               VOP_CTRL_SET(vop, rgb_pin_pol, pin_pol);
                break;
        case DRM_MODE_CONNECTOR_eDP:
+               VOP_CTRL_SET(vop, edp_pin_pol, pin_pol);
                VOP_CTRL_SET(vop, edp_en, 1);
                break;
        case DRM_MODE_CONNECTOR_HDMIA:
+               VOP_CTRL_SET(vop, hdmi_pin_pol, pin_pol);
                VOP_CTRL_SET(vop, hdmi_en, 1);
                break;
        case DRM_MODE_CONNECTOR_DSI:
+               VOP_CTRL_SET(vop, mipi_pin_pol, pin_pol);
                VOP_CTRL_SET(vop, mipi_en, 1);
                break;
        default:
index 28dafb6b7e5125227d70a2433c09d2465ac8130c..ff4f52e6883b7a8bf0d808178768f2d709ae3e64 100644 (file)
@@ -49,6 +49,10 @@ struct vop_ctrl {
        struct vop_reg dither_down;
        struct vop_reg dither_up;
        struct vop_reg pin_pol;
+       struct vop_reg rgb_pin_pol;
+       struct vop_reg hdmi_pin_pol;
+       struct vop_reg edp_pin_pol;
+       struct vop_reg mipi_pin_pol;
 
        struct vop_reg htotal_pw;
        struct vop_reg hact_st_end;
index e3f72ba5cb8a0e4cc84f1e8a3278d69e99faeca6..a21b13b0c7e6ab4c0918f68ca8176aa82765ac87 100644 (file)
@@ -279,11 +279,102 @@ static const struct vop_data rk3288_vop = {
        .win_size = ARRAY_SIZE(rk3288_vop_win_data),
 };
 
+static const struct vop_ctrl rk3399_ctrl_data = {
+       .standby = VOP_REG(RK3399_SYS_CTRL, 0x1, 22),
+       .gate_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 23),
+       .rgb_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 12),
+       .hdmi_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 13),
+       .edp_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 14),
+       .mipi_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 15),
+       .dither_down = VOP_REG(RK3399_DSP_CTRL1, 0xf, 1),
+       .dither_up = VOP_REG(RK3399_DSP_CTRL1, 0x1, 6),
+       .data_blank = VOP_REG(RK3399_DSP_CTRL0, 0x1, 19),
+       .out_mode = VOP_REG(RK3399_DSP_CTRL0, 0xf, 0),
+       .rgb_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 16),
+       .hdmi_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 20),
+       .edp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 24),
+       .mipi_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 28),
+       .htotal_pw = VOP_REG(RK3399_DSP_HTOTAL_HS_END, 0x1fff1fff, 0),
+       .hact_st_end = VOP_REG(RK3399_DSP_HACT_ST_END, 0x1fff1fff, 0),
+       .vtotal_pw = VOP_REG(RK3399_DSP_VTOTAL_VS_END, 0x1fff1fff, 0),
+       .vact_st_end = VOP_REG(RK3399_DSP_VACT_ST_END, 0x1fff1fff, 0),
+       .hpost_st_end = VOP_REG(RK3399_POST_DSP_HACT_INFO, 0x1fff1fff, 0),
+       .vpost_st_end = VOP_REG(RK3399_POST_DSP_VACT_INFO, 0x1fff1fff, 0),
+       .cfg_done = VOP_REG_MASK(RK3399_REG_CFG_DONE, 0x1, 0),
+};
+
+static const int rk3399_vop_intrs[] = {
+       FS_INTR,
+       0, 0,
+       LINE_FLAG_INTR,
+       0,
+       BUS_ERROR_INTR,
+       0, 0, 0, 0, 0, 0, 0,
+       DSP_HOLD_VALID_INTR,
+};
+
+static const struct vop_intr rk3399_vop_intr = {
+       .intrs = rk3399_vop_intrs,
+       .nintrs = ARRAY_SIZE(rk3399_vop_intrs),
+       .status = VOP_REG_MASK(RK3399_INTR_STATUS0, 0xffff, 0),
+       .enable = VOP_REG_MASK(RK3399_INTR_EN0, 0xffff, 0),
+       .clear = VOP_REG_MASK(RK3399_INTR_CLEAR0, 0xffff, 0),
+};
+
+static const struct vop_reg_data rk3399_init_reg_table[] = {
+       {RK3399_SYS_CTRL, 0x2000f800},
+       {RK3399_DSP_CTRL0, 0x00000000},
+       {RK3399_WIN0_CTRL0, 0x00000080},
+       {RK3399_WIN1_CTRL0, 0x00000080},
+       /* TODO: Win2/3 support multiple area function, but we haven't found
+        * a suitable way to use it yet, so let's just use them as other windows
+        * with only area 0 enabled.
+        */
+       {RK3399_WIN2_CTRL0, 0x00000010},
+       {RK3399_WIN3_CTRL0, 0x00000010},
+};
+
+static const struct vop_data rk3399_vop_big = {
+       .init_table = rk3399_init_reg_table,
+       .table_size = ARRAY_SIZE(rk3399_init_reg_table),
+       .intr = &rk3399_vop_intr,
+       .ctrl = &rk3399_ctrl_data,
+       /*
+        * rk3399 vop big windows register layout is same as rk3288.
+        */
+       .win = rk3288_vop_win_data,
+       .win_size = ARRAY_SIZE(rk3288_vop_win_data),
+};
+
+static const struct vop_win_data rk3399_vop_lit_win_data[] = {
+       { .base = 0x00, .phy = &rk3288_win01_data,
+         .type = DRM_PLANE_TYPE_PRIMARY },
+       { .base = 0x00, .phy = &rk3288_win23_data,
+         .type = DRM_PLANE_TYPE_CURSOR},
+};
+
+static const struct vop_data rk3399_vop_lit = {
+       .init_table = rk3399_init_reg_table,
+       .table_size = ARRAY_SIZE(rk3399_init_reg_table),
+       .intr = &rk3399_vop_intr,
+       .ctrl = &rk3399_ctrl_data,
+       /*
+        * rk3399 vop lit windows register layout is same as rk3288,
+        * but cut off the win1 and win3 windows.
+        */
+       .win = rk3399_vop_lit_win_data,
+       .win_size = ARRAY_SIZE(rk3399_vop_lit_win_data),
+};
+
 static const struct of_device_id vop_driver_dt_match[] = {
        { .compatible = "rockchip,rk3036-vop",
          .data = &rk3036_vop },
        { .compatible = "rockchip,rk3288-vop",
          .data = &rk3288_vop },
+       { .compatible = "rockchip,rk3399-vop-big",
+         .data = &rk3399_vop_big },
+       { .compatible = "rockchip,rk3399-vop-lit",
+         .data = &rk3399_vop_lit },
        {},
 };
 MODULE_DEVICE_TABLE(of, vop_driver_dt_match);
index d4b46cba2f26d93b942522f99c07fefcab1cc7ba..cd197260ece5defab17c0448d6cee18001bc14b3 100644 (file)
 #define RK3036_HWC_LUT_ADDR            0x800
 /* rk3036 register definition end */
 
+/* rk3399 register definition */
+#define RK3399_REG_CFG_DONE            0x00000
+#define RK3399_VERSION_INFO            0x00004
+#define RK3399_SYS_CTRL                        0x00008
+#define RK3399_SYS_CTRL1               0x0000c
+#define RK3399_DSP_CTRL0               0x00010
+#define RK3399_DSP_CTRL1               0x00014
+#define RK3399_DSP_BG                  0x00018
+#define RK3399_MCU_CTRL                        0x0001c
+#define RK3399_WB_CTRL0                        0x00020
+#define RK3399_WB_CTRL1                        0x00024
+#define RK3399_WB_YRGB_MST             0x00028
+#define RK3399_WB_CBR_MST              0x0002c
+#define RK3399_WIN0_CTRL0              0x00030
+#define RK3399_WIN0_CTRL1              0x00034
+#define RK3399_WIN0_COLOR_KEY          0x00038
+#define RK3399_WIN0_VIR                        0x0003c
+#define RK3399_WIN0_YRGB_MST           0x00040
+#define RK3399_WIN0_CBR_MST            0x00044
+#define RK3399_WIN0_ACT_INFO           0x00048
+#define RK3399_WIN0_DSP_INFO           0x0004c
+#define RK3399_WIN0_DSP_ST             0x00050
+#define RK3399_WIN0_SCL_FACTOR_YRGB    0x00054
+#define RK3399_WIN0_SCL_FACTOR_CBR     0x00058
+#define RK3399_WIN0_SCL_OFFSET         0x0005c
+#define RK3399_WIN0_SRC_ALPHA_CTRL     0x00060
+#define RK3399_WIN0_DST_ALPHA_CTRL     0x00064
+#define RK3399_WIN0_FADING_CTRL                0x00068
+#define RK3399_WIN0_CTRL2              0x0006c
+#define RK3399_WIN1_CTRL0              0x00070
+#define RK3399_WIN1_CTRL1              0x00074
+#define RK3399_WIN1_COLOR_KEY          0x00078
+#define RK3399_WIN1_VIR                        0x0007c
+#define RK3399_WIN1_YRGB_MST           0x00080
+#define RK3399_WIN1_CBR_MST            0x00084
+#define RK3399_WIN1_ACT_INFO           0x00088
+#define RK3399_WIN1_DSP_INFO           0x0008c
+#define RK3399_WIN1_DSP_ST             0x00090
+#define RK3399_WIN1_SCL_FACTOR_YRGB    0x00094
+#define RK3399_WIN1_SCL_FACTOR_CBR     0x00098
+#define RK3399_WIN1_SCL_OFFSET         0x0009c
+#define RK3399_WIN1_SRC_ALPHA_CTRL     0x000a0
+#define RK3399_WIN1_DST_ALPHA_CTRL     0x000a4
+#define RK3399_WIN1_FADING_CTRL                0x000a8
+#define RK3399_WIN1_CTRL2              0x000ac
+#define RK3399_WIN2_CTRL0              0x000b0
+#define RK3399_WIN2_CTRL1              0x000b4
+#define RK3399_WIN2_VIR0_1             0x000b8
+#define RK3399_WIN2_VIR2_3             0x000bc
+#define RK3399_WIN2_MST0               0x000c0
+#define RK3399_WIN2_DSP_INFO0          0x000c4
+#define RK3399_WIN2_DSP_ST0            0x000c8
+#define RK3399_WIN2_COLOR_KEY          0x000cc
+#define RK3399_WIN2_MST1               0x000d0
+#define RK3399_WIN2_DSP_INFO1          0x000d4
+#define RK3399_WIN2_DSP_ST1            0x000d8
+#define RK3399_WIN2_SRC_ALPHA_CTRL     0x000dc
+#define RK3399_WIN2_MST2               0x000e0
+#define RK3399_WIN2_DSP_INFO2          0x000e4
+#define RK3399_WIN2_DSP_ST2            0x000e8
+#define RK3399_WIN2_DST_ALPHA_CTRL     0x000ec
+#define RK3399_WIN2_MST3               0x000f0
+#define RK3399_WIN2_DSP_INFO3          0x000f4
+#define RK3399_WIN2_DSP_ST3            0x000f8
+#define RK3399_WIN2_FADING_CTRL                0x000fc
+#define RK3399_WIN3_CTRL0              0x00100
+#define RK3399_WIN3_CTRL1              0x00104
+#define RK3399_WIN3_VIR0_1             0x00108
+#define RK3399_WIN3_VIR2_3             0x0010c
+#define RK3399_WIN3_MST0               0x00110
+#define RK3399_WIN3_DSP_INFO0          0x00114
+#define RK3399_WIN3_DSP_ST0            0x00118
+#define RK3399_WIN3_COLOR_KEY          0x0011c
+#define RK3399_WIN3_MST1               0x00120
+#define RK3399_WIN3_DSP_INFO1          0x00124
+#define RK3399_WIN3_DSP_ST1            0x00128
+#define RK3399_WIN3_SRC_ALPHA_CTRL     0x0012c
+#define RK3399_WIN3_MST2               0x00130
+#define RK3399_WIN3_DSP_INFO2          0x00134
+#define RK3399_WIN3_DSP_ST2            0x00138
+#define RK3399_WIN3_DST_ALPHA_CTRL     0x0013c
+#define RK3399_WIN3_MST3               0x00140
+#define RK3399_WIN3_DSP_INFO3          0x00144
+#define RK3399_WIN3_DSP_ST3            0x00148
+#define RK3399_WIN3_FADING_CTRL                0x0014c
+#define RK3399_HWC_CTRL0               0x00150
+#define RK3399_HWC_CTRL1               0x00154
+#define RK3399_HWC_MST                 0x00158
+#define RK3399_HWC_DSP_ST              0x0015c
+#define RK3399_HWC_SRC_ALPHA_CTRL      0x00160
+#define RK3399_HWC_DST_ALPHA_CTRL      0x00164
+#define RK3399_HWC_FADING_CTRL         0x00168
+#define RK3399_HWC_RESERVED1           0x0016c
+#define RK3399_POST_DSP_HACT_INFO      0x00170
+#define RK3399_POST_DSP_VACT_INFO      0x00174
+#define RK3399_POST_SCL_FACTOR_YRGB    0x00178
+#define RK3399_POST_RESERVED           0x0017c
+#define RK3399_POST_SCL_CTRL           0x00180
+#define RK3399_POST_DSP_VACT_INFO_F1   0x00184
+#define RK3399_DSP_HTOTAL_HS_END       0x00188
+#define RK3399_DSP_HACT_ST_END         0x0018c
+#define RK3399_DSP_VTOTAL_VS_END       0x00190
+#define RK3399_DSP_VACT_ST_END         0x00194
+#define RK3399_DSP_VS_ST_END_F1                0x00198
+#define RK3399_DSP_VACT_ST_END_F1      0x0019c
+#define RK3399_PWM_CTRL                        0x001a0
+#define RK3399_PWM_PERIOD_HPR          0x001a4
+#define RK3399_PWM_DUTY_LPR            0x001a8
+#define RK3399_PWM_CNT                 0x001ac
+#define RK3399_BCSH_COLOR_BAR          0x001b0
+#define RK3399_BCSH_BCS                        0x001b4
+#define RK3399_BCSH_H                  0x001b8
+#define RK3399_BCSH_CTRL               0x001bc
+#define RK3399_CABC_CTRL0              0x001c0
+#define RK3399_CABC_CTRL1              0x001c4
+#define RK3399_CABC_CTRL2              0x001c8
+#define RK3399_CABC_CTRL3              0x001cc
+#define RK3399_CABC_GAUSS_LINE0_0      0x001d0
+#define RK3399_CABC_GAUSS_LINE0_1      0x001d4
+#define RK3399_CABC_GAUSS_LINE1_0      0x001d8
+#define RK3399_CABC_GAUSS_LINE1_1      0x001dc
+#define RK3399_CABC_GAUSS_LINE2_0      0x001e0
+#define RK3399_CABC_GAUSS_LINE2_1      0x001e4
+#define RK3399_FRC_LOWER01_0           0x001e8
+#define RK3399_FRC_LOWER01_1           0x001ec
+#define RK3399_FRC_LOWER10_0           0x001f0
+#define RK3399_FRC_LOWER10_1           0x001f4
+#define RK3399_FRC_LOWER11_0           0x001f8
+#define RK3399_FRC_LOWER11_1           0x001fc
+#define RK3399_AFBCD0_CTRL             0x00200
+#define RK3399_AFBCD0_HDR_PTR          0x00204
+#define RK3399_AFBCD0_PIC_SIZE         0x00208
+#define RK3399_AFBCD0_STATUS           0x0020c
+#define RK3399_AFBCD1_CTRL             0x00220
+#define RK3399_AFBCD1_HDR_PTR          0x00224
+#define RK3399_AFBCD1_PIC_SIZE         0x00228
+#define RK3399_AFBCD1_STATUS           0x0022c
+#define RK3399_AFBCD2_CTRL             0x00240
+#define RK3399_AFBCD2_HDR_PTR          0x00244
+#define RK3399_AFBCD2_PIC_SIZE         0x00248
+#define RK3399_AFBCD2_STATUS           0x0024c
+#define RK3399_AFBCD3_CTRL             0x00260
+#define RK3399_AFBCD3_HDR_PTR          0x00264
+#define RK3399_AFBCD3_PIC_SIZE         0x00268
+#define RK3399_AFBCD3_STATUS           0x0026c
+#define RK3399_INTR_EN0                        0x00280
+#define RK3399_INTR_CLEAR0             0x00284
+#define RK3399_INTR_STATUS0            0x00288
+#define RK3399_INTR_RAW_STATUS0                0x0028c
+#define RK3399_INTR_EN1                        0x00290
+#define RK3399_INTR_CLEAR1             0x00294
+#define RK3399_INTR_STATUS1            0x00298
+#define RK3399_INTR_RAW_STATUS1                0x0029c
+#define RK3399_LINE_FLAG               0x002a0
+#define RK3399_VOP_STATUS              0x002a4
+#define RK3399_BLANKING_VALUE          0x002a8
+#define RK3399_MCU_BYPASS_PORT         0x002ac
+#define RK3399_WIN0_DSP_BG             0x002b0
+#define RK3399_WIN1_DSP_BG             0x002b4
+#define RK3399_WIN2_DSP_BG             0x002b8
+#define RK3399_WIN3_DSP_BG             0x002bc
+#define RK3399_YUV2YUV_WIN             0x002c0
+#define RK3399_YUV2YUV_POST            0x002c4
+#define RK3399_AUTO_GATING_EN          0x002cc
+#define RK3399_WIN0_CSC_COE            0x003a0
+#define RK3399_WIN1_CSC_COE            0x003c0
+#define RK3399_WIN2_CSC_COE            0x003e0
+#define RK3399_WIN3_CSC_COE            0x00400
+#define RK3399_HWC_CSC_COE             0x00420
+#define RK3399_BCSH_R2Y_CSC_COE                0x00440
+#define RK3399_BCSH_Y2R_CSC_COE                0x00460
+#define RK3399_POST_YUV2YUV_Y2R_COE    0x00480
+#define RK3399_POST_YUV2YUV_3X3_COE    0x004a0
+#define RK3399_POST_YUV2YUV_R2Y_COE    0x004c0
+#define RK3399_WIN0_YUV2YUV_Y2R                0x004e0
+#define RK3399_WIN0_YUV2YUV_3X3                0x00500
+#define RK3399_WIN0_YUV2YUV_R2Y                0x00520
+#define RK3399_WIN1_YUV2YUV_Y2R                0x00540
+#define RK3399_WIN1_YUV2YUV_3X3                0x00560
+#define RK3399_WIN1_YUV2YUV_R2Y                0x00580
+#define RK3399_WIN2_YUV2YUV_Y2R                0x005a0
+#define RK3399_WIN2_YUV2YUV_3X3                0x005c0
+#define RK3399_WIN2_YUV2YUV_R2Y                0x005e0
+#define RK3399_WIN3_YUV2YUV_Y2R                0x00600
+#define RK3399_WIN3_YUV2YUV_3X3                0x00620
+#define RK3399_WIN3_YUV2YUV_R2Y                0x00640
+#define RK3399_WIN2_LUT_ADDR           0x01000
+#define RK3399_WIN3_LUT_ADDR           0x01400
+#define RK3399_HWC_LUT_ADDR            0x01800
+#define RK3399_CABC_GAMMA_LUT_ADDR     0x01c00
+#define RK3399_GAMMA_LUT_ADDR          0x02000
+/* rk3399 register definition end */
+
 #endif /* _ROCKCHIP_VOP_REG_H */