shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rocckhip: vop: rename to NEXT_HDR feature

Browse Source 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I148ecf0f400c98e8c5e79716a6c69add3b21b6e5
This commit is contained in:
Sandy Huang
2021-10-28 15:57:40 +08:00
committed by Tao Huang
parent 2a53aab5cf
commit dd32d33d69
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@@ -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",

2
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
View File

@@ -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)

6
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -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",

2
include/uapi/drm/rockchip_drm.h
View File

@@ -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 {