From bf9c5670aecec51fdceeee7a59455db1d4efd54c Mon Sep 17 00:00:00 2001 From: Zhang Yubing Date: Tue, 25 Jul 2023 15:36:51 +0800 Subject: [PATCH] drm/rockchip: vop2: report vividhdr feature by property Signed-off-by: Zhang Yubing Change-Id: I2d680b2066050ca2eeba0947936cc43a8855cbb1 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 3 +++ include/uapi/drm/rockchip_drm.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 51e0789ee885..4f77fb27fd24 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -11077,6 +11077,7 @@ static int vop2_crtc_create_feature_property(struct vop2 *vop2, struct drm_crtc { ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE, "ALPHA_SCALE" }, { ROCKCHIP_DRM_CRTC_FEATURE_HDR10, "HDR10" }, { ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR, "NEXT_HDR" }, + { ROCKCHIP_DRM_CRTC_FEATURE_VIVID_HDR, "VIVID_HDR" }, }; if (vp_data->feature & VOP_FEATURE_ALPHA_SCALE) @@ -11085,6 +11086,8 @@ static int vop2_crtc_create_feature_property(struct vop2 *vop2, struct drm_crtc feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_HDR10); if (vp_data->feature & VOP_FEATURE_NEXT_HDR) feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR); + if (vp_data->feature & VOP_FEATURE_VIVID_HDR) + feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_VIVID_HDR); prop = drm_property_create_bitmask(vop2->drm_dev, DRM_MODE_PROP_IMMUTABLE, "FEATURE", diff --git a/include/uapi/drm/rockchip_drm.h b/include/uapi/drm/rockchip_drm.h index 59f842d572d5..2ac71b43dba0 100644 --- a/include/uapi/drm/rockchip_drm.h +++ b/include/uapi/drm/rockchip_drm.h @@ -91,6 +91,7 @@ enum rockchip_crtc_feture { ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE, ROCKCHIP_DRM_CRTC_FEATURE_HDR10, ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR, + ROCKCHIP_DRM_CRTC_FEATURE_VIVID_HDR, }; enum rockchip_plane_feture {