From ff41712dcfa4798fb48939497add1d735a3264bf Mon Sep 17 00:00:00 2001 From: Damon Ding Date: Tue, 24 May 2022 18:49:44 +0800 Subject: [PATCH] drm/rockchip: unify the color key flag in vop and vop2 Signed-off-by: Damon Ding Change-Id: I4f0130b4c47e6d83bdf78161a4c01388fde66742 --- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index e3baf007c061..fb1dd0186658 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -34,6 +34,9 @@ struct drm_device; struct drm_connector; struct iommu_domain; +#define VOP_COLOR_KEY_NONE (0 << 31) +#define VOP_COLOR_KEY_MASK (1 << 31) + #define VOP_OUTPUT_IF_RGB BIT(0) #define VOP_OUTPUT_IF_BT1120 BIT(1) #define VOP_OUTPUT_IF_BT656 BIT(2) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 8d2c87b630cb..0cc5a5eb7c5f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -153,9 +153,6 @@ /* KHZ */ #define VOP2_MAX_DCLK_RATE 600000 -#define VOP2_COLOR_KEY_NONE (0 << 31) -#define VOP2_COLOR_KEY_MASK (1 << 31) - enum vop2_data_format { VOP2_FMT_ARGB8888 = 0, VOP2_FMT_RGB888, @@ -4179,7 +4176,7 @@ static void vop2_plane_setup_color_key(struct drm_plane *plane) uint32_t g = 0; uint32_t b = 0; - if (!(vpstate->color_key & VOP2_COLOR_KEY_MASK) || fb->format->is_yuv) { + if (!(vpstate->color_key & VOP_COLOR_KEY_MASK) || fb->format->is_yuv) { VOP_WIN_SET(vop2, win, color_key_en, 0); return; }