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

drm/rockchip: vop2: Setup dly for vp even there is no plane

Browse Source 
We notice there are many POST_BUF_EMPTY irq when user space
enable a video port but without any attached plane.

Setup dly in this situation can avoid the POST_BUF_EMPTY
irq storm.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I907eb1737ac134dda8b2d237584c9d2f2b917b5e
This commit is contained in:
Andy Yan
2021-12-22 11:34:57 +08:00
committed by Tao Huang
parent f925d936cb
commit 29af993b46
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6561,21 +6561,14 @@ static void vop2_setup_port_mux(struct vop2_video_port *vp, uint16_t port_mux_cf
spin_unlock(&vop2->reg_lock);
}
static void vop2_setup_layer_mixer_for_vp(struct vop2_video_port *vp,
const struct vop2_zpos *vop2_zpos)
static u16 vop2_calc_bg_ovl_and_port_mux(struct vop2_video_port *vp)
{
struct vop2_video_port *prev_vp;
struct vop2 *vop2 = vp->vop2;
u8 port_id = vp->id;
const struct vop2_data *vop2_data = vop2->data;
uint8_t nr_layers = vp->nr_layers;
const struct vop2_zpos *zpos;
struct vop2_win *win;
struct vop2_layer *layer;
u16 port_mux_cfg = 0;
u8 port_mux;
u8 used_layers = 0;
u8 layer_id, win_phys_id;
int i;
for (i = 0; i < vop2_data->nr_vps - 1; i++) {
@@ -6608,6 +6601,26 @@ static void vop2_setup_layer_mixer_for_vp(struct vop2_video_port *vp,
port_mux_cfg |= 7 << (4 * (vop2->data->nr_vps - 1));
return port_mux_cfg;
}
static void vop2_setup_layer_mixer_for_vp(struct vop2_video_port *vp,
const struct vop2_zpos *vop2_zpos)
{
struct vop2_video_port *prev_vp;
struct vop2 *vop2 = vp->vop2;
u8 port_id = vp->id;
uint8_t nr_layers = vp->nr_layers;
const struct vop2_zpos *zpos;
struct vop2_win *win;
struct vop2_layer *layer;
u8 used_layers = 0;
u8 layer_id, win_phys_id;
u16 port_mux_cfg;
int i;
port_mux_cfg = vop2_calc_bg_ovl_and_port_mux(vp);
/*
* Win and layer must map one by one, if a win is selected
* by two layers, unexpected error may happen.
@@ -6615,7 +6628,6 @@ static void vop2_setup_layer_mixer_for_vp(struct vop2_video_port *vp,
* old win of the layer to the layer where the new win comes from.
*
*/
used_layers = 0;
for (i = 0; i < port_id; i++) {
prev_vp = &vop2->vps[i];
used_layers += hweight32(prev_vp->win_mask);
@@ -6853,6 +6865,9 @@ static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state
}
} else {
vop2_calc_bg_ovl_and_port_mux(vp);
vop2_setup_dly_for_vp(vp);
}
/* The pre alpha overlay of Cluster still need process in one win mode. */