diff --git a/Makefile b/Makefile
index f282ec13..91e368e8 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,9 @@ subdir-ccflags-y += -DNV_SPLIT_PAGE_POOL_HEADER
 
 # Unexport helpers for fd/handle conversion
 subdir-ccflags-y += -DNV_UNEXPORT_FD_HANDLE_CONVERSION
+
+# FB Deferred IO helpers name alignment
+subdir-ccflags-y += -DNV_FB_DEFERRED_IO_OPS_RENAME
 endif
 
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index 48cc0d5d..49d3ffff 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -215,10 +215,16 @@ static int tegra_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)
+#if defined(NV_FB_DEFERRED_IO_OPS_RENAME)
+FB_GEN_DEFAULT_DEFERRED_IOMEM_OPS(tegra_fb,
+			       drm_fb_helper_damage_range,
+			       drm_fb_helper_damage_area)
+#else
 FB_GEN_DEFAULT_DEFERRED_IO_OPS(tegra_fb,
 			       drm_fb_helper_damage_range,
 			       drm_fb_helper_damage_area)
 #endif
+#endif
 
 static const struct fb_ops tegra_fb_ops = {
 	.owner = THIS_MODULE,