From 9ccda79b71095a3d7118c7b94f4198b5de849dde Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Tue, 30 Jul 2024 14:10:03 +0800 Subject: [PATCH] drm/rockchip: vop: remove NV20 and NV30 depend on CONFIG_NO_GKI NV20 and NV30 is supported by drm core, so no need to depend on CONFIG_NO_GKI. Signed-off-by: Sandy Huang Change-Id: I21c7ed5741ea89da6999f38b37d3a248699385fd --- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 5de662b3433d..8008159f0a5b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -69,10 +69,8 @@ static const uint32_t formats_win_full_10bit[] = { DRM_FORMAT_NV24, DRM_FORMAT_NV42, DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */ -#ifdef CONFIG_NO_GKI DRM_FORMAT_NV20, /* yuv422_10bit linear mode, 2 plane, no padding */ DRM_FORMAT_NV30, /* yuv444_10bit linear mode, 2 plane, no padding */ -#endif }; static const uint32_t formats_win_full_10bit_yuyv[] = { @@ -91,10 +89,8 @@ static const uint32_t formats_win_full_10bit_yuyv[] = { DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV42, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */ -#ifdef CONFIG_NO_GKI DRM_FORMAT_NV20, /* yuv422_10bit linear mode, 2 plane, no padding */ DRM_FORMAT_NV30, /* yuv444_10bit linear mode, 2 plane, no padding */ -#endif DRM_FORMAT_YVYU, /* yuv422_8bit[YVYU] linear mode or non-Linear mode */ DRM_FORMAT_VYUY, /* yuv422_8bit[VYUY] linear mode or non-Linear mode */ DRM_FORMAT_YUYV, /* yuv422_8bit[YUYV] linear mode or non-Linear mode */