drm/stm: Use drm_fbdev_generic_setup()

The CMA helper is already using the drm_fb_helper_generic_probe part of
the generic fbdev emulation. This patch makes full use of the generic
fbdev emulation by using its drm_client callbacks. This means that
drm_mode_config_funcs->output_poll_changed and drm_driver->lastclose are
now handled by the emulation code. Additionally fbdev unregister happens
automatically on drm_dev_unregister().

The drm_fbdev_generic_setup() call is put after drm_dev_register() in the
driver. This is done to highlight the fact that fbdev emulation is an
internal client that makes use of the driver, it is not part of the
driver as such. If fbdev setup fails, an error is printed, but the driver
succeeds probing.

drm_fbdev_generic_setup() handles mode_config.num_connector being zero.
In that case it retries fbdev setup on the next .output_poll_changed.

Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Philippe Cornu <philippe.cornu@st.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Yannick Fertré <yannick.fertre@st.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180908134648.2582-15-noralf@tronnes.org

diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c
index d05f8f80fe6f6bda3d48e69b951ad4733beda681..8dec001b9d37c4ffde3700c0d49cf874b7face64 100644 (file)
--- a/drivers/gpu/drm/stm/drv.c
+++ b/drivers/gpu/drm/stm/drv.c
@@ -26,7 +26,6 @@
 
 static const struct drm_mode_config_funcs drv_mode_config_funcs = {
        .fb_create = drm_gem_fb_create,
-       .output_poll_changed = drm_fb_helper_output_poll_changed,
        .atomic_check = drm_atomic_helper_check,
        .atomic_commit = drm_atomic_helper_commit,
 };
@@ -52,7 +51,6 @@ DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops);
 static struct drm_driver drv_driver = {
        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
                           DRIVER_ATOMIC,
-       .lastclose = drm_fb_helper_lastclose,
        .name = "stm",
        .desc = "STMicroelectronics SoC DRM",
        .date = "20170330",
@@ -110,12 +108,6 @@ static int drv_load(struct drm_device *ddev)
        drm_mode_config_reset(ddev);
        drm_kms_helper_poll_init(ddev);
 
-       if (ddev->mode_config.num_connector) {
-               ret = drm_fb_cma_fbdev_init(ddev, 16, 0);
-               if (ret)
-                       DRM_DEBUG("Warning: fails to create fbdev\n");
-       }
-
        platform_set_drvdata(pdev, ddev);
 
        return 0;
@@ -128,7 +120,6 @@ static void drv_unload(struct drm_device *ddev)
 {
        DRM_DEBUG("%s\n", __func__);
 
-       drm_fb_cma_fbdev_fini(ddev);
        drm_kms_helper_poll_fini(ddev);
        ltdc_unload(ddev);
        drm_mode_config_cleanup(ddev);
@@ -156,6 +147,8 @@ static int stm_drm_platform_probe(struct platform_device *pdev)
        if (ret)
                goto err_put;
 
+       drm_fbdev_generic_setup(ddev, 16);
+
        return 0;
 
 err_put: