From 91c367006c14917dcd32af348ab598bb844466f5 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Sat, 2 Dec 2023 16:55:11 +0000 Subject: [PATCH] drm/tegra: Drop version check The version check in the Tegra DRM GEM code is not necessary because this is a fix to the code and so remove the version check. Bug 3820317 Change-Id: Ib7f5bd2bdb61af50e17399079aa2439bf8d352b1 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3026925 Reviewed-by: Laxman Dewangan Reviewed-by: Mikko Perttunen GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/gem.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 45425758..4aa338c8 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -725,7 +724,6 @@ static int tegra_gem_prime_vmap(struct dma_buf *buf, struct iosys_map *map) { struct drm_gem_object *gem = buf->priv; struct tegra_bo *bo = to_tegra_bo(gem); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) void *vaddr; vaddr = tegra_bo_mmap(&bo->base); @@ -733,21 +731,16 @@ static int tegra_gem_prime_vmap(struct dma_buf *buf, struct iosys_map *map) return PTR_ERR(vaddr); iosys_map_set_vaddr(map, vaddr); -#else - iosys_map_set_vaddr(map, bo->vaddr); -#endif return 0; } static void tegra_gem_prime_vunmap(struct dma_buf *buf, struct iosys_map *map) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) struct drm_gem_object *gem = buf->priv; struct tegra_bo *bo = to_tegra_bo(gem); tegra_bo_munmap(&bo->base, map->vaddr); -#endif } #else static int tegra_gem_prime_vmap(struct dma_buf *buf, struct dma_buf_map *map)