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: fix start mixer id error

Browse Source 
Change-Id: I6e6287d43d375f8a8be47fe00cbe39764ffe6ee3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2021-03-18 15:41:19 +08:00
parent f5fe9966d4
commit aed22eb670
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4285,26 +4285,18 @@ static void vop2_parse_alpha(struct vop2_alpha_config *alpha_config,
alpha->dst_alpha_ctrl.bits.factor_mode = ALPHA_SRC_INVERSE;
}
static int vop2_get_mixer_number(int nr_layers)
{
if (nr_layers <= 1)
return nr_layers;
else
return nr_layers - 1;
}
static int vop2_find_start_mixer_id_for_vp(struct vop2 *vop2, uint8_t port_id)
{
struct vop2_video_port *vp;
int mixer_id = 0;
int used_layer = 0;
int i;
for (i = 0; i < port_id; i++) {
vp = &vop2->vps[i];
mixer_id += vop2_get_mixer_number(hweight32(vp->win_mask));
used_layer += hweight32(vp->win_mask);
}
return mixer_id ? (mixer_id + 1) : 0;
return used_layer;
}
/*