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

drm/rockchip: vop: add support CSC

Browse Source 
Change-Id: I4ed359529825fc6c8d91460e89aa48ec9ed3e13f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2019-07-18 10:06:56 +08:00
committed by Tao Huang
parent 265d4bcbae
commit 6b2cb2ade2
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,7 +430,7 @@ static void vop_load_sdr2hdr_table(struct vop *vop, uint32_t cmd)
table->sdr2hdr_st2084oetf_xn[i]);
}
static __maybe_unused void vop_load_csc_table(struct vop *vop, u32 offset, const u32 *table)
static void vop_load_csc_table(struct vop *vop, u32 offset, const u32 *table)
{
int i;
@@ -1062,6 +1062,12 @@ static int vop_csc_atomic_check(struct drm_crtc *crtc,
if (ret)
return ret;
vop_setup_csc_mode(is_input_yuv, s->yuv_overlay,
vop_plane_state->color_space, s->color_space,
&vop_plane_state->y2r_en,
&vop_plane_state->r2y_en,
&vop_plane_state->csc_mode);
if (csc_table) {
vop_plane_state->y2r_en = !!vop_plane_state->y2r_table;
vop_plane_state->r2r_en = !!vop_plane_state->r2r_table;
@@ -1069,12 +1075,6 @@ static int vop_csc_atomic_check(struct drm_crtc *crtc,
continue;
}
vop_setup_csc_mode(is_input_yuv, s->yuv_overlay,
vop_plane_state->color_space, s->color_space,
&vop_plane_state->y2r_en,
&vop_plane_state->r2y_en,
&vop_plane_state->csc_mode);
/*
* This is update for IC design not reasonable, when enable
* hdr2sdr on rk3328, vop can't support per-pixel alpha * global
@@ -1516,6 +1516,9 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
uint32_t act_info, dsp_info, dsp_st;
struct drm_rect *src = &vop_plane_state->src;
struct drm_rect *dest = &vop_plane_state->dest;
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;
uint32_t val;
bool rb_swap, global_alpha_en;
int is_yuv = fb->format->is_yuv;
@@ -1632,9 +1635,9 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
VOP_WIN_SET(vop, win, csc_mode, vop_plane_state->csc_mode);
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_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, vop_plane_state->y2r_en);
VOP_WIN_SET_EXT(vop, win, csc, r2r_en, vop_plane_state->r2r_en);
VOP_WIN_SET_EXT(vop, win, csc, r2y_en, vop_plane_state->r2y_en);
@@ -3055,9 +3058,18 @@ static void vop_tv_config_update(struct drm_crtc *crtc,
if (!s->tv_state)
return;
/*
* The BCSH only need to config once except one of the following
* condition changed:
* 1. tv_state: include brightness,contrast,saturation and hue;
* 2. yuv_overlay: it is related to BCSH r2y module;
* 3. mode_update: it is indicate mode change and resume from suspend;
* 4. bcsh_en: control the BCSH module enable or disable state;
* 5. bus_format: it is related to BCSH y2r module;
*/
if (!memcmp(s->tv_state,
&vop->active_tv_state, sizeof(*s->tv_state)) &&
s->yuv_overlay == old_s->yuv_overlay &&
s->yuv_overlay == old_s->yuv_overlay && vop->mode_update &&
s->bcsh_en == old_s->bcsh_en && s->bus_format == old_s->bus_format)
return;

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

@@ -93,6 +93,7 @@ struct vop_csc {
struct vop_reg y2r_en;
struct vop_reg r2r_en;
struct vop_reg r2y_en;
struct vop_reg csc_mode;
uint32_t y2r_offset;
uint32_t r2r_offset;