From e05d38ded58e1bab909da09fefc7c4268bb9c6d7 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 2 Sep 2021 11:31:20 +0800 Subject: [PATCH] drm/rockchip: vop2: Use macro for window phys_id Change-Id: Icca89acb0397781c64538c68cc40530e1104455e Signed-off-by: Andy Yan --- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index 2a3a101bec70..6ee2377d84c4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -1236,12 +1236,12 @@ static const struct vop2_ctrl rk3568_vop_ctrl = { .edp_dclk_pol = VOP_REG(RK3568_DSP_IF_POL, 0x1, 15), .mipi_pin_pol = VOP_REG(RK3568_DSP_IF_POL, 0x7, 16), .mipi_dclk_pol = VOP_REG(RK3568_DSP_IF_POL, 0x1, 19), - .win_vp_id[0] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 16), - .win_vp_id[1] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 18), - .win_vp_id[2] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 24), - .win_vp_id[3] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 26), - .win_vp_id[4] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 28), - .win_vp_id[5] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 30), + .win_vp_id[ROCKCHIP_VOP2_CLUSTER0] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 16), + .win_vp_id[ROCKCHIP_VOP2_CLUSTER1] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 18), + .win_vp_id[ROCKCHIP_VOP2_ESMART0] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 24), + .win_vp_id[ROCKCHIP_VOP2_ESMART1] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 26), + .win_vp_id[ROCKCHIP_VOP2_SMART0] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 28), + .win_vp_id[ROCKCHIP_VOP2_SMART1] = VOP_REG(RK3568_OVL_PORT_SEL, 0x3, 30), .win_dly[0] = VOP_REG(RK3568_CLUSTER_DLY_NUM, 0xffff, 0), .win_dly[1] = VOP_REG(RK3568_CLUSTER_DLY_NUM, 0xffff, 16), .win_dly[2] = VOP_REG(RK3568_SMART_DLY_NUM, 0xff, 0),