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

drm/rockchip: unify the color key flag in vop and vop2

Browse Source 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I4f0130b4c47e6d83bdf78161a4c01388fde66742
This commit is contained in:
Damon Ding
2022-05-24 18:49:44 +08:00
committed by Tao Huang
parent 9e445581db
commit ff41712dcf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
View File

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

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

@@ -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;
}