From fd59bc909540791635da2c6d79b8bde42d02d8fd Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Tue, 8 Oct 2024 14:57:38 +0800 Subject: [PATCH] drm/rockchip: vop2: move win phy id define to rockchip_vop.h The win phy id can be used by dts and vop2 driver, so move them together at rockchip_vop.h Signed-off-by: Sandy Huang Change-Id: I0d6c8d48ba42425ff73d65aef843011d7112d981 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 17 ++--------------- include/dt-bindings/display/rockchip_vop.h | 2 ++ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 147a7f44feb3..3620ee4529cb 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -21,6 +21,7 @@ #ifdef CONFIG_DRM_ANALOGIX_DP #include #endif +#include #include #include @@ -244,20 +245,6 @@ enum vop2_pending { VOP_PENDING_FB_UNREF, }; -enum vop2_layer_phy_id { - ROCKCHIP_VOP2_CLUSTER0 = 0, - ROCKCHIP_VOP2_CLUSTER1, - ROCKCHIP_VOP2_ESMART0, - ROCKCHIP_VOP2_ESMART1, - ROCKCHIP_VOP2_SMART0, - ROCKCHIP_VOP2_SMART1, - ROCKCHIP_VOP2_CLUSTER2, - ROCKCHIP_VOP2_CLUSTER3, - ROCKCHIP_VOP2_ESMART2, - ROCKCHIP_VOP2_ESMART3, - ROCKCHIP_VOP2_PHY_ID_INVALID = -1, -}; - struct pixel_shift_data { u64 last_crtc_update_count; u64 crtc_update_count; @@ -810,7 +797,7 @@ struct vop2_video_port { * @primary_plane_phy_id: vp primary plane phy id, the primary plane * will be used to show uboot logo and kernel logo */ - enum vop2_layer_phy_id primary_plane_phy_id; + int primary_plane_phy_id; struct post_acm acm_info; struct post_csc csc_info; diff --git a/include/dt-bindings/display/rockchip_vop.h b/include/dt-bindings/display/rockchip_vop.h index 3e14128e7ab1..55d25bfd8875 100644 --- a/include/dt-bindings/display/rockchip_vop.h +++ b/include/dt-bindings/display/rockchip_vop.h @@ -18,4 +18,6 @@ #define ROCKCHIP_VOP2_ESMART2 8 #define ROCKCHIP_VOP2_ESMART3 9 +#define ROCKCHIP_VOP2_PHY_ID_INVALID -1 + #endif