2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index e2a15c63a81f..1f1780ccdbdf 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -178,7 +178,6 @@ static struct drm_driver vc4_drm_driver = {
                             DRIVER_RENDER |
                             DRIVER_PRIME |
                             DRIVER_SYNCOBJ),
-        .lastclose = drm_fb_helper_lastclose,
         .open = vc4_open,
         .postclose = vc4_close,
         .irq_handler = vc4_irq,
@@ -288,6 +287,8 @@ static int vc4_drm_bind(struct device *dev)
 
         vc4_kms_load(drm);
 
+        drm_fbdev_generic_setup(drm, 32);
+
         return 0;
 
 unbind_all:
@@ -307,8 +308,6 @@ static void vc4_drm_unbind(struct device *dev)
 
         drm_dev_unregister(drm);
 
-        drm_fb_cma_fbdev_fini(drm);
-
         drm_mode_config_cleanup(drm);
 
         drm_atomic_private_obj_fini(&vc4->ctm_manager);
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index ca5aa7fba769..127468785f74 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -19,8 +19,6 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_plane_helper.h>
-#include <drm/drm_fb_helper.h>
-#include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include "vc4_drv.h"
 #include "vc4_regs.h"
@@ -394,7 +392,6 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)
 }
 
 static const struct drm_mode_config_funcs vc4_mode_funcs = {
-        .output_poll_changed = drm_fb_helper_output_poll_changed,
         .atomic_check = vc4_atomic_check,
         .atomic_commit = vc4_atomic_commit,
         .fb_create = vc4_fb_create,
@@ -434,9 +431,6 @@ int vc4_kms_load(struct drm_device *dev)
 
         drm_mode_config_reset(dev);
 
-        if (dev->mode_config.num_connector)
-                drm_fb_cma_fbdev_init(dev, 32, 0);
-
         drm_kms_helper_poll_init(dev);
 
         return 0;