shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop: Add support for color bar

Browse Source 
RV1126B support horizontial and vertical color bar.

Change-Id: Idf4fe9d125585286b928f4728b0567ea4c20aa2e
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
This commit is contained in:
Chaoyi Chen
2024-11-14 15:28:00 +00:00
committed by Tao Huang
parent bdc1cace60
commit c80bc3d76f
3 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@@ -2920,6 +2920,7 @@ static int vop_crtc_debugfs_init(struct drm_minor *minor, struct drm_crtc *crtc)
#if defined(CONFIG_ROCKCHIP_DRM_DEBUG)
rockchip_drm_add_dump_buffer(crtc, vop->debugfs);
rockchip_drm_debugfs_add_regs_write(crtc, vop->debugfs);
rockchip_drm_debugfs_add_color_bar(crtc, vop->debugfs);
#endif
for (i = 0; i < ARRAY_SIZE(vop_debugfs_files); i++)
vop->debugfs_files[i].data = vop;
@@ -3309,6 +3310,47 @@ static void vop_crtc_te_handler(struct drm_crtc *crtc)
VOP_CTRL_SET(vop, mcu_frame_st, 1);
}
#if defined(CONFIG_ROCKCHIP_DRM_DEBUG)
static int vop_crtc_set_color_bar(struct drm_crtc *crtc, enum rockchip_color_bar_mode mode)
{
struct vop *vop = to_vop(crtc);
int ret = 0;
if (!crtc->state->active) {
DRM_INFO("VOP disabled\n");
return -EINVAL;
}
if (!VOP_CTRL_SUPPORT(vop, color_bar_en)) {
DRM_INFO("color bar not support\n");
return -EINVAL;
}
switch (mode) {
case ROCKCHIP_COLOR_BAR_OFF:
VOP_CTRL_SET(vop, color_bar_en, 0);
vop_cfg_done(vop);
break;
case ROCKCHIP_COLOR_BAR_HORIZONTAL:
VOP_CTRL_SET(vop, color_bar_mode, 0);
VOP_CTRL_SET(vop, color_bar_en, 1);
vop_cfg_done(vop);
break;
case ROCKCHIP_COLOR_BAR_VERTICAL:
VOP_CTRL_SET(vop, color_bar_mode, 1);
VOP_CTRL_SET(vop, color_bar_en, 1);
vop_cfg_done(vop);
break;
default:
DRM_INFO("Unsupported color bar mode\n");
ret = -EINVAL;
break;
}
return ret;
}
#endif
static const struct rockchip_crtc_funcs private_crtc_funcs = {
.loader_protect = vop_crtc_loader_protect,
.cancel_pending_vblank = vop_crtc_cancel_pending_vblank,
@@ -3322,6 +3364,9 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = {
.crtc_send_mcu_cmd = vop_crtc_send_mcu_cmd,
.wait_vact_end = vop_crtc_wait_vact_end,
.te_handler = vop_crtc_te_handler,
#if defined(CONFIG_ROCKCHIP_DRM_DEBUG)
.crtc_set_color_bar = vop_crtc_set_color_bar,
#endif
};
static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,

4
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
View File

@@ -472,6 +472,10 @@ struct vop_ctrl {
struct vop_reg enable;
struct vop_reg inf_out_en;
struct vop_reg out_dresetn;
/* color bar */
struct vop_reg color_bar_en;
struct vop_reg color_bar_mode;
};
struct vop_intr {

2
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
View File

@@ -1950,6 +1950,8 @@ static const struct vop_ctrl rv1126b_ctrl_data = {
.dsp_black = VOP_REG(RK3366_LIT_DSP_CTRL2, 0x1, 15),
.out_mode = VOP_REG(RK3366_LIT_DSP_CTRL2, 0xf, 16),
.dsp_layer_sel = VOP_REG(RK3366_LIT_DSP_CTRL2, 0xff, 22),
.color_bar_mode = VOP_REG(RK3366_LIT_DSP_CTRL2, 0xff, 28),
.color_bar_en = VOP_REG(RK3366_LIT_DSP_CTRL2, 0xff, 31),
.htotal_pw = VOP_REG(RK3366_LIT_DSP_HTOTAL_HS_END, 0x0fff0fff, 0),
.hact_st_end = VOP_REG(RK3366_LIT_DSP_HACT_ST_END, 0x0fff0fff, 0),