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: skip fist frame when port_mux is changed

Browse Source 
we must make sure the port_mux configuration is take effet
before configure a window that is moved from another VP.

Change-Id: I4ca581292e08ef30cc4b6eb47aef02e678f38a66
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Andy Yan
2021-04-06 11:00:06 +08:00
committed by Sandy Huang
parent 3655480f00
commit f674b60549
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,6 +301,11 @@ struct vop2_win {
* one win can only attach to one vp at the one time.
*/
uint8_t vp_mask;
/**
* @old_vp_mask: Bitmask of video_port0/1/2 this win attached of last commit,
* this is used for trackng the change of VOP2_PORT_SEL register.
*/
uint8_t old_vp_mask;
uint8_t zpos;
uint32_t offset;
enum drm_plane_type type;
@@ -2364,6 +2369,7 @@ static void vop2_layer_map_initial(struct vop2 *vop2, uint32_t current_vp_id)
VOP_CTRL_SET(vop2, win_vp_id[win->phys_id], last_active_vp->id);
}
win->old_vp_mask = win->vp_mask;
}
}
}
@@ -2843,6 +2849,18 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s
return;
}
/*
* This means this window is moved from another vp
* so the VOP2_PORT_SEL register is changed
* in this commit, we should not change this
* win register before the VOP2_PORT_SEL take effect
* on this VP, so skip this frame for safe.
*/
if (win->old_vp_mask != win->vp_mask) {
win->old_vp_mask = win->vp_mask;
return;
}
actual_w = drm_rect_width(src) >> 16;
actual_h = drm_rect_height(src) >> 16;
dsp_w = drm_rect_width(dest);