diff --git a/Makefile b/Makefile
index 43e8c0ea..f282ec13 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,9 @@ subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING
 
 # Split types and declaration of net/page_pool.h
 subdir-ccflags-y += -DNV_SPLIT_PAGE_POOL_HEADER
+
+# Unexport helpers for fd/handle conversion
+subdir-ccflags-y += -DNV_UNEXPORT_FD_HANDLE_CONVERSION
 endif
 
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 4ce70d60..6eef0560 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -891,8 +891,10 @@ static const struct drm_driver tegra_drm_driver = {
 	.debugfs_init = tegra_debugfs_init,
 #endif
 
+#if !defined(NV_UNEXPORT_FD_HANDLE_CONVERSION)
 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+#endif
 	.gem_prime_import = tegra_gem_prime_import,
 
 	.dumb_create = tegra_bo_dumb_create,