forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

drm/rockchip: vop2: move win phy id define to rockchip_vop.h

Browse source 
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 <hjc@rock-chips.com>
Change-Id: I0d6c8d48ba42425ff73d65aef843011d7112d981
This commit is contained in:
Sandy Huang 2024-10-08 14:57:38 +08:00 • committed by Huang Jiachai
commit fd59bc9095
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View file

@ -21,6 +21,7 @@
#ifdef CONFIG_DRM_ANALOGIX_DP
#include <drm/bridge/analogix_dp.h>
#endif
#include <dt-bindings/display/rockchip_vop.h>
#include <linux/debugfs.h>
#include <linux/fixp-arith.h>
@ -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;

2
include/dt-bindings/display/rockchip_vop.h
View file

@ -18,4 +18,6 @@
#define ROCKCHIP_VOP2_ESMART2 8
#define ROCKCHIP_VOP2_ESMART3 9
#define ROCKCHIP_VOP2_PHY_ID_INVALID -1
#endif