From cd392c00dbe0e4ad8f8b35194a3e2927affd1f9a Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 16 Sep 2021 15:34:58 +0800 Subject: [PATCH] drm/rockchip: drv: add common property for vop and vop2 Signed-off-by: Sandy Huang Change-Id: Ied641fcf9843c1a39500ece1d15913a5405efa38 --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 14 ++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 4665e990f303..da538aa9ab1d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -461,6 +461,20 @@ static int rockchip_drm_create_properties(struct drm_device *dev) return -ENOMEM; private->connector_id_prop = prop; + prop = drm_property_create_object(dev, + DRM_MODE_PROP_ATOMIC | DRM_MODE_PROP_IMMUTABLE, + "SOC_ID", DRM_MODE_OBJECT_CRTC); + private->soc_id_prop = prop; + + prop = drm_property_create_object(dev, + DRM_MODE_PROP_ATOMIC | DRM_MODE_PROP_IMMUTABLE, + "PORT_ID", DRM_MODE_OBJECT_CRTC); + private->port_id_prop = prop; + + private->aclk_prop = drm_property_create_range(dev, 0, "ACLK", 0, UINT_MAX); + private->bg_prop = drm_property_create_range(dev, 0, "BACKGROUND", 0, UINT_MAX); + private->line_flag_prop = drm_property_create_range(dev, 0, "LINE_FLAG1", 0, UINT_MAX); + return drm_mode_create_tv_properties(dev, 0, NULL); } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index e39bac9ec6ca..1b1c01d1ea35 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -182,6 +182,14 @@ struct rockchip_drm_private { struct mutex psr_list_lock; struct mutex commit_lock; + /* private crtc prop */ + struct drm_property *soc_id_prop; + struct drm_property *port_id_prop; + struct drm_property *aclk_prop; + struct drm_property *bg_prop; + struct drm_property *line_flag_prop; + + /* private plane prop */ struct drm_property *eotf_prop; struct drm_property *color_space_prop; struct drm_property *global_alpha_prop; @@ -189,6 +197,8 @@ struct rockchip_drm_private { struct drm_property *alpha_scale_prop; struct drm_property *async_commit_prop; struct drm_property *share_id_prop; + + /* private connector prop */ struct drm_property *connector_id_prop; const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC];