From d201a63d39183907fc9d51a49ebec2b9b7c985ac Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 2 Sep 2021 09:33:15 +0800 Subject: [PATCH] drm/rockchip: vop2: No need to check active vp in layer_map_initial 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 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 64f925a26a00..2d923eef4c70 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2576,28 +2576,12 @@ static void vop2_layer_map_initial(struct vop2 *vop2, uint32_t current_vp_id) uint32_t win_map, vp_id; uint16_t port_mux_cfg = 0; uint16_t port_mux; - uint32_t active_vp_mask = 0; - uint32_t standby; uint32_t shift; int i, j; layer_map = vop2_readl(vop2, layer->regs->layer_sel.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++) { vp = &vop2->vps[i]; vp->win_mask = 0;