Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+2 -9
+2 -9
drivers/gpu/drm/stm/drv.c
··· 26 26 27 27 static const struct drm_mode_config_funcs drv_mode_config_funcs = { 28 28 .fb_create = drm_gem_fb_create, 29 - .output_poll_changed = drm_fb_helper_output_poll_changed, 30 29 .atomic_check = drm_atomic_helper_check, 31 30 .atomic_commit = drm_atomic_helper_commit, 32 31 }; ··· 51 52 static struct drm_driver drv_driver = { 52 53 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | 53 54 DRIVER_ATOMIC, 54 - .lastclose = drm_fb_helper_lastclose, 55 55 .name = "stm", 56 56 .desc = "STMicroelectronics SoC DRM", 57 57 .date = "20170330", ··· 108 110 drm_mode_config_reset(ddev); 109 111 drm_kms_helper_poll_init(ddev); 110 112 111 - if (ddev->mode_config.num_connector) { 112 - ret = drm_fb_cma_fbdev_init(ddev, 16, 0); 113 - if (ret) 114 - DRM_DEBUG("Warning: fails to create fbdev\n"); 115 - } 116 - 117 113 platform_set_drvdata(pdev, ddev); 118 114 119 115 return 0; ··· 120 128 { 121 129 DRM_DEBUG("%s\n", __func__); 122 130 123 - drm_fb_cma_fbdev_fini(ddev); 124 131 drm_kms_helper_poll_fini(ddev); 125 132 ltdc_unload(ddev); 126 133 drm_mode_config_cleanup(ddev); ··· 146 155 ret = drm_dev_register(ddev, 0); 147 156 if (ret) 148 157 goto err_put; 158 + 159 + drm_fbdev_generic_setup(ddev, 16); 149 160 150 161 return 0; 151 162