drm/arm/mali: Use drm_fb_cma_fbdev_init/fini()

Use drm_fb_cma_fbdev_init() and drm_fb_cma_fbdev_fini() which relies on
the fact that drm_device holds a pointer to the drm_fb_helper structure.
This means that the driver doesn't have to keep track of that.
Also use the drm_fb_helper functions directly.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171115142001.45358-20-noralf@tronnes.org

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index e080e31a8513a0b74c5b9150be2fa0f293df7d49..3d82712d80028cffdfab2bc93e03960c683ea2c4 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/component.h>
-#include <linux/console.h>
 #include <linux/of_device.h>
 #include <linux/of_graph.h>
 #include <linux/of_reserved_mem.h>
@@ -24,6 +23,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_helper.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
@@ -183,13 +183,6 @@ static int malidp_set_and_wait_config_valid(struct drm_device *drm)
        return (ret > 0) ? 0 : -ETIMEDOUT;
 }
 
-static void malidp_output_poll_changed(struct drm_device *drm)
-{
-       struct malidp_drm *malidp = drm->dev_private;
-
-       drm_fbdev_cma_hotplug_event(malidp->fbdev);
-}
-
 static void malidp_atomic_commit_hw_done(struct drm_atomic_state *state)
 {
        struct drm_pending_vblank_event *event;
@@ -252,7 +245,7 @@ static const struct drm_mode_config_helper_funcs malidp_mode_config_helpers = {
 
 static const struct drm_mode_config_funcs malidp_mode_config_funcs = {
        .fb_create = drm_gem_fb_create,
-       .output_poll_changed = malidp_output_poll_changed,
+       .output_poll_changed = drm_fb_helper_output_poll_changed,
        .atomic_check = drm_atomic_helper_check,
        .atomic_commit = drm_atomic_helper_commit,
 };
@@ -317,19 +310,12 @@ static int malidp_irq_init(struct platform_device *pdev)
        return 0;
 }
 
-static void malidp_lastclose(struct drm_device *drm)
-{
-       struct malidp_drm *malidp = drm->dev_private;
-
-       drm_fbdev_cma_restore_mode(malidp->fbdev);
-}
-
 DEFINE_DRM_GEM_CMA_FOPS(fops);
 
 static struct drm_driver malidp_driver = {
        .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |
                           DRIVER_PRIME,
-       .lastclose = malidp_lastclose,
+       .lastclose = drm_fb_helper_lastclose,
        .gem_free_object_unlocked = drm_gem_cma_free_object,
        .gem_vm_ops = &drm_gem_cma_vm_ops,
        .dumb_create = drm_gem_cma_dumb_create,
@@ -623,14 +609,9 @@ static int malidp_bind(struct device *dev)
 
        drm_mode_config_reset(drm);
 
-       malidp->fbdev = drm_fbdev_cma_init(drm, 32,
-                                          drm->mode_config.num_connector);
-
-       if (IS_ERR(malidp->fbdev)) {
-               ret = PTR_ERR(malidp->fbdev);
-               malidp->fbdev = NULL;
+       ret = drm_fb_cma_fbdev_init(drm, 32, 0);
+       if (ret)
                goto fbdev_fail;
-       }
 
        drm_kms_helper_poll_init(drm);
 
@@ -641,10 +622,7 @@ static int malidp_bind(struct device *dev)
        return 0;
 
 register_fail:
-       if (malidp->fbdev) {
-               drm_fbdev_cma_fini(malidp->fbdev);
-               malidp->fbdev = NULL;
-       }
+       drm_fb_cma_fbdev_fini(drm);
        drm_kms_helper_poll_fini(drm);
 fbdev_fail:
        pm_runtime_get_sync(dev);
@@ -681,10 +659,7 @@ static void malidp_unbind(struct device *dev)
        struct malidp_drm *malidp = drm->dev_private;
 
        drm_dev_unregister(drm);
-       if (malidp->fbdev) {
-               drm_fbdev_cma_fini(malidp->fbdev);
-               malidp->fbdev = NULL;
-       }
+       drm_fb_cma_fbdev_fini(drm);
        drm_kms_helper_poll_fini(drm);
        pm_runtime_get_sync(dev);
        malidp_se_irq_fini(drm);

diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h
index 70ed6aeccf052192c50c3b9f48f3c135d112e786..e0d12c9fc6b8093c4a0aaa8f7bacf0798dea2e11 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_drv.h
+++ b/drivers/gpu/drm/arm/malidp_drv.h
@@ -20,7 +20,6 @@
 
 struct malidp_drm {
        struct malidp_hw_device *dev;
-       struct drm_fbdev_cma *fbdev;
        struct drm_crtc crtc;
        wait_queue_head_t wq;
        atomic_t config_valid;