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

drm/rockchip: vop2: No need to check active vp in layer_map_initial

Browse Source 
We assign window between vp by plane_mask now, no
need to check which vp is activated from register.

Change-Id: I89d22f253dcd26898dc79304d51b8a8d9e802bb2
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Andy Yan
2021-09-02 09:33:15 +08:00
parent 9d60286b72
commit 55462060b2
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2527,28 +2527,12 @@ static void vop2_layer_map_initial(struct vop2 *vop2, uint32_t current_vp_id)
uint32_t win_map, vp_id; uint32_t win_map, vp_id;
uint16_t port_mux_cfg = 0; uint16_t port_mux_cfg = 0;
uint16_t port_mux; uint16_t port_mux;
uint32_t active_vp_mask = 0;
uint32_t standby;
uint32_t shift; uint32_t shift;
int i, j; int i, j;
layer_map = vop2_readl(vop2, layer->regs->layer_sel.offset); layer_map = vop2_readl(vop2, layer->regs->layer_sel.offset);
win_map = vop2_readl(vop2, vp->regs->port_mux.offset); win_map = vop2_readl(vop2, vp->regs->port_mux.offset);
active_vp_mask |= BIT(current_vp_id);
/*
* lookup if there are some vps activated
* by bootloader(et: show boot logo)
*/
for (i = 0; i < vop2->data->nr_vps; i++) {
vp = &vop2->vps[i];
standby = vop2_readl(vop2, vp->regs->standby.offset);
shift = vp->regs->standby.shift;
standby = (standby >> shift) & 0x1;
if (!standby)
active_vp_mask |= BIT(i);
}
for (i = 0; i < vop2->data->nr_vps; i++) { for (i = 0; i < vop2->data->nr_vps; i++) {
vp = &vop2->vps[i]; vp = &vop2->vps[i];
vp->win_mask = 0; vp->win_mask = 0;