From 003a780b6fb1843b04e5637b9d90e313bbcd98f5 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 14 Mar 2024 08:47:23 +0800 Subject: [PATCH] drm/rockchip: vop2: 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: I74dbd8e69367dd1d705624e07e6a6ea2bb9a21f8 --- drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index f9bb35235371..cbe6a9449ed9 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -67,10 +67,8 @@ static const uint32_t formats_for_vop3_cluster[] = { DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV42, /* yvu444_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_YUV420_8BIT, /* yuv420_8bit non-Linear mode only */ DRM_FORMAT_YUV420_10BIT, /* yuv420_10bit non-Linear mode only */ DRM_FORMAT_YUYV, /* yuv422_8bit non-Linear mode only*/ @@ -93,10 +91,8 @@ static const uint32_t formats_for_esmart[] = { DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV42, /* yvu444_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 */ DRM_FORMAT_VYUY, /* yuv422_8bit[VYUY] linear mode */ DRM_FORMAT_YUYV, /* yuv422_8bit[YUYV] linear mode */ @@ -117,10 +113,8 @@ static const uint32_t formats_for_rk356x_esmart[] = { DRM_FORMAT_NV16, /* yuv422_8bit linear mode, 2 plane */ DRM_FORMAT_NV24, /* 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_YUYV, /* yuv422_8bit[YUYV] linear mode */ DRM_FORMAT_UYVY, /* yuv422_8bit[UYVY] linear mode */ }; @@ -150,10 +144,8 @@ static const uint32_t formats_for_vop3_esmart[] = { DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV42, /* yvu444_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 */ DRM_FORMAT_VYUY, /* yuv422_8bit[VYUY] linear mode */ DRM_FORMAT_YUYV, /* yuv422_8bit[YUYV] linear mode */