From 74fb3941eb80b4d0430a29c488955cbf576d9e88 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Sun, 29 Aug 2021 09:58:06 +0800 Subject: [PATCH] drm/rockchip: make VOP_FEATURE_ definitions public for all vop versions Definition VOP_FEATURE_OUTPUT_RGB10 and VOP_FEATURE_INTERNAL_RGB are from upstream, so we move our private definition VOP_FEATURE_AFBDC and VOP_FEATURE_ALPHA_SCALE to other bits. Signed-off-by: Andy Yan Change-Id: I44a4f4864bd7d82af120dfe361b9af700d7d8ae9 --- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 90efe902451b..6fe6454e109a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -25,8 +25,13 @@ #define AFBDC_FMT_RGB565 0x0 #define AFBDC_FMT_U8U8U8U8 0x5 #define AFBDC_FMT_U8U8U8 0x4 -#define VOP_FEATURE_OUTPUT_10BIT BIT(0) -#define VOP_FEATURE_ALPHA_SCALE BIT(1) + +#define VOP_FEATURE_OUTPUT_RGB10 BIT(0) +#define VOP_FEATURE_INTERNAL_RGB BIT(1) +#define VOP_FEATURE_AFBDC BIT(2) +#define VOP_FEATURE_ALPHA_SCALE BIT(3) + +#define VOP_FEATURE_OUTPUT_10BIT VOP_FEATURE_OUTPUT_RGB10 #define WIN_FEATURE_HDR2SDR BIT(0) #define WIN_FEATURE_SDR2HDR BIT(1)