67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
|
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
|
||
|
|
index 73d24c6bbf05..d4ac6e161ef2 100644
|
||
|
|
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
|
||
|
|
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
|
||
|
|
@@ -614,6 +614,44 @@ static const struct vop_common rk3288_common = {
|
||
|
|
.dsp_background = VOP_REG(RK3288_DSP_BG, 0xffffffff, 0),
|
||
|
|
};
|
||
|
|
|
||
|
|
+static const struct vop_win_phy rk3228_win0_data = {
|
||
|
|
+ .scl = &rk3288_win_full_scl,
|
||
|
|
+ .data_formats = formats_win_full,
|
||
|
|
+ .nformats = ARRAY_SIZE(formats_win_full),
|
||
|
|
+ .enable = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 0),
|
||
|
|
+ .format = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 1),
|
||
|
|
+ .rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),
|
||
|
|
+ .act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),
|
||
|
|
+ .dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0),
|
||
|
|
+ .dsp_st = VOP_REG(RK3288_WIN0_DSP_ST, 0x1fff1fff, 0),
|
||
|
|
+ .yrgb_mst = VOP_REG(RK3288_WIN0_YRGB_MST, 0xffffffff, 0),
|
||
|
|
+ .uv_mst = VOP_REG(RK3288_WIN0_CBR_MST, 0xffffffff, 0),
|
||
|
|
+ .yrgb_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 0),
|
||
|
|
+ .uv_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 16),
|
||
|
|
+ .src_alpha_ctl = VOP_REG(RK3288_WIN0_SRC_ALPHA_CTRL, 0xff, 0),
|
||
|
|
+ .dst_alpha_ctl = VOP_REG(RK3288_WIN0_DST_ALPHA_CTRL, 0xff, 0),
|
||
|
|
+ .channel = VOP_REG(RK3288_WIN0_CTRL2, 0xff, 0),
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+static const struct vop_win_phy rk3228_win1_data = {
|
||
|
|
+ .scl = &rk3288_win_full_scl,
|
||
|
|
+ .data_formats = formats_win_lite,
|
||
|
|
+ .nformats = ARRAY_SIZE(formats_win_lite),
|
||
|
|
+ .enable = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 0),
|
||
|
|
+ .format = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 1),
|
||
|
|
+ .rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),
|
||
|
|
+ .act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),
|
||
|
|
+ .dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0),
|
||
|
|
+ .dsp_st = VOP_REG(RK3288_WIN0_DSP_ST, 0x1fff1fff, 0),
|
||
|
|
+ .yrgb_mst = VOP_REG(RK3288_WIN0_YRGB_MST, 0xffffffff, 0),
|
||
|
|
+ .uv_mst = VOP_REG(RK3288_WIN0_CBR_MST, 0xffffffff, 0),
|
||
|
|
+ .yrgb_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 0),
|
||
|
|
+ .uv_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 16),
|
||
|
|
+ .src_alpha_ctl = VOP_REG(RK3288_WIN0_SRC_ALPHA_CTRL, 0xff, 0),
|
||
|
|
+ .dst_alpha_ctl = VOP_REG(RK3288_WIN0_DST_ALPHA_CTRL, 0xff, 0),
|
||
|
|
+ .channel = VOP_REG(RK3288_WIN0_CTRL2, 0xff, 0),
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Note: rk3288 has a dedicated 'cursor' window, however, that window requires
|
||
|
|
* special support to get alpha blending working. For now, just use overlay
|
||
|
|
@@ -864,10 +902,10 @@ static const struct vop_data rk3399_vop_lit = {
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct vop_win_data rk3228_vop_win_data[] = {
|
||
|
|
- { .base = 0x00, .phy = &rk3288_win01_data,
|
||
|
|
+ { .base = 0x00, .phy = &rk3228_win0_data,
|
||
|
|
.type = DRM_PLANE_TYPE_PRIMARY },
|
||
|
|
- { .base = 0x40, .phy = &rk3288_win01_data,
|
||
|
|
- .type = DRM_PLANE_TYPE_CURSOR },
|
||
|
|
+ { .base = 0x40, .phy = &rk3228_win1_data,
|
||
|
|
+ .type = DRM_PLANE_TYPE_OVERLAY },
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct vop_data rk3228_vop = {
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|