From dd32d33d6962fae2a03f783b3102d4ef06b381df Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 28 Oct 2021 15:57:40 +0800 Subject: [PATCH] drm/rocckhip: vop: rename to NEXT_HDR feature Signed-off-by: Sandy Huang Change-Id: I148ecf0f400c98e8c5e79716a6c69add3b21b6e5 --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +++--- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 6 +++--- include/uapi/drm/rockchip_drm.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 5ed961e1e611..e6469e5131d2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -4378,15 +4378,15 @@ static int vop_crtc_create_feature_property(struct vop *vop, struct drm_crtc *cr static const struct drm_prop_enum_list props[] = { { ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE, "ALPHA_SCALE" }, { ROCKCHIP_DRM_CRTC_FEATURE_HDR10, "HDR10" }, - { ROCKCHIP_DRM_CRTC_FEATURE_DOLBY_HDR, "DOLBY_HDR" }, + { ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR, "NEXT_HDR" }, }; if (vop_data->feature & VOP_FEATURE_ALPHA_SCALE) feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE); if (vop_data->feature & VOP_FEATURE_ALPHA_HDR10) feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_HDR10); - if (vop_data->feature & VOP_FEATURE_ALPHA_DOLBY_HDR) - feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_DOLBY_HDR); + if (vop_data->feature & VOP_FEATURE_ALPHA_NEXT_HDR) + feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR); prop = drm_property_create_bitmask(vop->drm_dev, DRM_MODE_PROP_IMMUTABLE, "FEATURE", diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 52a0e691a0a6..910c55449ea2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -33,7 +33,7 @@ #define VOP_FEATURE_INTERNAL_RGB BIT(1) #define VOP_FEATURE_ALPHA_SCALE BIT(2) #define VOP_FEATURE_ALPHA_HDR10 BIT(3) -#define VOP_FEATURE_ALPHA_DOLBY_HDR BIT(4) +#define VOP_FEATURE_ALPHA_NEXT_HDR BIT(4) /* a feature to splice two windows and two vps to support resolution > 4096 */ #define VOP_FEATURE_SPLICE BIT(5) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 4436ea7476b1..b1c94458b05d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -6827,15 +6827,15 @@ static int vop2_crtc_create_feature_property(struct vop2 *vop2, struct drm_crtc static const struct drm_prop_enum_list props[] = { { ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE, "ALPHA_SCALE" }, { ROCKCHIP_DRM_CRTC_FEATURE_HDR10, "HDR10" }, - { ROCKCHIP_DRM_CRTC_FEATURE_DOLBY_HDR, "DOLBY_HDR" }, + { ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR, "NEXT_HDR" }, }; if (vp_data->feature & VOP_FEATURE_ALPHA_SCALE) feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE); if (vp_data->feature & VOP_FEATURE_ALPHA_HDR10) feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_HDR10); - if (vp_data->feature & VOP_FEATURE_ALPHA_DOLBY_HDR) - feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_DOLBY_HDR); + if (vp_data->feature & VOP_FEATURE_ALPHA_NEXT_HDR) + feature |= BIT(ROCKCHIP_DRM_CRTC_FEATURE_NEXT_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 a0a73ca7831c..246192fa2922 100644 --- a/include/uapi/drm/rockchip_drm.h +++ b/include/uapi/drm/rockchip_drm.h @@ -82,7 +82,7 @@ enum drm_rockchip_gem_cpu_acquire_type { enum rockchip_crtc_feture { ROCKCHIP_DRM_CRTC_FEATURE_ALPHA_SCALE, ROCKCHIP_DRM_CRTC_FEATURE_HDR10, - ROCKCHIP_DRM_CRTC_FEATURE_DOLBY_HDR, + ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR, }; enum rockchip_plane_feture {