diff --git a/kernel-open/conftest.sh b/kernel-open/conftest.sh
index dae07d2b4..d1779fa64 100755
--- a/kernel-open/conftest.sh
+++ b/kernel-open/conftest.sh
@@ -122,6 +122,7 @@ test_headers() {
     FILES="$FILES drm/drm_ioctl.h"
     FILES="$FILES drm/drm_device.h"
     FILES="$FILES drm/drm_mode_config.h"
+    FILES="$FILES drm/drm_fb_helper.h"
     FILES="$FILES dt-bindings/interconnect/tegra_icc_id.h"
     FILES="$FILES generated/autoconf.h"
     FILES="$FILES generated/compile.h"
diff --git a/kernel-open/nvidia-drm/nvidia-drm-drv.c b/kernel-open/nvidia-drm/nvidia-drm-drv.c
index cf2080db3..77007d41e 100644
--- a/kernel-open/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel-open/nvidia-drm/nvidia-drm-drv.c
@@ -60,6 +60,10 @@
 #include <drm/drm_ioctl.h>
 #endif
 
+#if defined(NV_DRM_DRM_FB_HELPER_H_PRESENT)
+#include <drm/drm_fb_helper.h>
+#endif
+
 #include <linux/pci.h>
 
 /*
@@ -947,6 +951,10 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
     nv_dev->next = dev_list;
     dev_list = nv_dev;
 
+    #if defined(NV_DRM_DRM_FB_HELPER_H_PRESENT)
+    drm_fbdev_generic_setup(dev, 0);
+    #endif
+
     return; /* Success */
 
 failed_drm_register: