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

drm/rockchip: vop2: Disable right VP and win in splice mode

Browse Source 
The VP(CRTC) and WIN(plane) of right part is invisible for
userspace.

We should disable it when the userspace want to disable
the left part VP and Plane.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I9fa0385e345a699bc13df9b6b65f4f26c5538200
This commit is contained in:
Andy Yan
2021-11-19 09:45:38 +08:00
committed by Tao Huang
parent 5e083cfd18
commit fa631748f8
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -1459,9 +1459,13 @@ static void vop2_win_disable(struct vop2_win *win)
{
struct vop2 *vop2 = win->vop2;
win->left_win = NULL;
win->splice_win = NULL;
win->splice_mode_right = false;
/* Disable the right splice win */
if (win->splice_win) {
vop2_win_disable(win->splice_win);
win->left_win = NULL;
win->splice_win = NULL;
win->splice_mode_right = false;
}
if (win->enabled) {
VOP_WIN_SET(vop2, win, enable, 0);
@@ -3151,6 +3155,8 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc,
struct vop2_video_port *vp = to_vop2_video_port(crtc);
struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state);
struct vop2 *vop2 = vp->vop2;
const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id];
struct vop2_video_port *splice_vp = &vop2->vps[vp_data->splice_vp_id];
bool dual_channel = !!(vcstate->output_flags & ROCKCHIP_OUTPUT_DUAL_CHANNEL_LEFT_RIGHT_MODE);
int ret;
@@ -3208,6 +3214,8 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc,
spin_lock(&vop2->reg_lock);
if (vcstate->splice_mode)
VOP_MODULE_SET(vop2, splice_vp, standby, 1);
VOP_MODULE_SET(vop2, vp, standby, 1);
spin_unlock(&vop2->reg_lock);