From b4f2921807563d292ec3313a84d815c167fcbc95 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Wed, 3 Mar 2021 11:32:29 +0000 Subject: [PATCH] drm/tegra: Remove the staging definitions When building Tegra DRM as an out-of-tree module for upstream development we always want to enable the STAGING ioctls and so removing the STAGING definitions from Tegra DRM. JIRA LS-34 Change-Id: Ie7c398e0f5f29d5ad2b07109b1b5d4c44eda880a Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2492589 Tested-by: mobile promotions Reviewed-by: Mikko Perttunen Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/drm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 11c1c5a2..8440ba5f 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -337,7 +337,6 @@ put: } -#ifdef CONFIG_DRM_TEGRA_STAGING static int tegra_gem_create(struct drm_device *drm, void *data, struct drm_file *file) { @@ -726,10 +725,8 @@ static int tegra_gem_get_flags(struct drm_device *drm, void *data, return 0; } -#endif static const struct drm_ioctl_desc tegra_drm_ioctls[] = { -#ifdef CONFIG_DRM_TEGRA_STAGING DRM_IOCTL_DEF_DRV(TEGRA_CHANNEL_OPEN, tegra_drm_ioctl_channel_open, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(TEGRA_CHANNEL_CLOSE, tegra_drm_ioctl_channel_close, @@ -771,7 +768,6 @@ static const struct drm_ioctl_desc tegra_drm_ioctls[] = { DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(TEGRA_GEM_GET_FLAGS, tegra_gem_get_flags, DRM_RENDER_ALLOW), -#endif }; static const struct file_operations tegra_drm_fops = {