1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c
index 47fe30223444..33e0483d62ae 100644
--- a/drivers/gpu/drm/pl111/pl111_drv.c
+++ b/drivers/gpu/drm/pl111/pl111_drv.c
@@ -194,8 +194,6 @@ static int pl111_modeset_init(struct drm_device *dev)
 
         drm_mode_config_reset(dev);
 
-        drm_fb_cma_fbdev_init(dev, priv->variant->fb_bpp, 0);
-
         drm_kms_helper_poll_init(dev);
 
         goto finish;
@@ -232,7 +230,6 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
 static struct drm_driver pl111_drm_driver = {
         .driver_features =
                 DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
-        .lastclose = drm_fb_helper_lastclose,
         .ioctls = NULL,
         .fops = &drm_fops,
         .name = "pl111",
@@ -332,6 +329,8 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
         if (ret < 0)
                 goto dev_put;
 
+        drm_fbdev_generic_setup(drm, priv->variant->fb_bpp);
+
         return 0;
 
 dev_put:
@@ -348,7 +347,6 @@ static int pl111_amba_remove(struct amba_device *amba_dev)
         struct pl111_drm_dev_private *priv = drm->dev_private;
 
         drm_dev_unregister(drm);
-        drm_fb_cma_fbdev_fini(drm);
         if (priv->panel)
                 drm_panel_bridge_remove(priv->bridge);
         drm_mode_config_cleanup(drm);