| .. | .. |
|---|
| 14 | 14 | #include <linux/clk.h> |
|---|
| 15 | 15 | #include <linux/component.h> |
|---|
| 16 | 16 | #include <linux/console.h> |
|---|
| 17 | +#include <linux/dma-mapping.h> |
|---|
| 17 | 18 | #include <linux/list.h> |
|---|
| 18 | 19 | #include <linux/of_graph.h> |
|---|
| 19 | 20 | #include <linux/of_reserved_mem.h> |
|---|
| 21 | +#include <linux/platform_device.h> |
|---|
| 20 | 22 | #include <linux/pm_runtime.h> |
|---|
| 21 | 23 | |
|---|
| 22 | | -#include <drm/drmP.h> |
|---|
| 23 | 24 | #include <drm/drm_atomic_helper.h> |
|---|
| 24 | 25 | #include <drm/drm_crtc.h> |
|---|
| 25 | | -#include <drm/drm_crtc_helper.h> |
|---|
| 26 | | -#include <drm/drm_fb_helper.h> |
|---|
| 26 | +#include <drm/drm_debugfs.h> |
|---|
| 27 | +#include <drm/drm_drv.h> |
|---|
| 27 | 28 | #include <drm/drm_fb_cma_helper.h> |
|---|
| 29 | +#include <drm/drm_fb_helper.h> |
|---|
| 28 | 30 | #include <drm/drm_gem_cma_helper.h> |
|---|
| 29 | 31 | #include <drm/drm_gem_framebuffer_helper.h> |
|---|
| 32 | +#include <drm/drm_irq.h> |
|---|
| 30 | 33 | #include <drm/drm_modeset_helper.h> |
|---|
| 31 | 34 | #include <drm/drm_of.h> |
|---|
| 35 | +#include <drm/drm_probe_helper.h> |
|---|
| 36 | +#include <drm/drm_vblank.h> |
|---|
| 32 | 37 | |
|---|
| 33 | 38 | #include "hdlcd_drv.h" |
|---|
| 34 | 39 | #include "hdlcd_regs.h" |
|---|
| .. | .. |
|---|
| 103 | 108 | |
|---|
| 104 | 109 | static const struct drm_mode_config_funcs hdlcd_mode_config_funcs = { |
|---|
| 105 | 110 | .fb_create = drm_gem_fb_create, |
|---|
| 106 | | - .output_poll_changed = drm_fb_helper_output_poll_changed, |
|---|
| 107 | 111 | .atomic_check = drm_atomic_helper_check, |
|---|
| 108 | 112 | .atomic_commit = drm_atomic_helper_commit, |
|---|
| 109 | 113 | }; |
|---|
| .. | .. |
|---|
| 220 | 224 | { "clocks", hdlcd_show_pxlclock, 0 }, |
|---|
| 221 | 225 | }; |
|---|
| 222 | 226 | |
|---|
| 223 | | -static int hdlcd_debugfs_init(struct drm_minor *minor) |
|---|
| 227 | +static void hdlcd_debugfs_init(struct drm_minor *minor) |
|---|
| 224 | 228 | { |
|---|
| 225 | | - return drm_debugfs_create_files(hdlcd_debugfs_list, |
|---|
| 226 | | - ARRAY_SIZE(hdlcd_debugfs_list), minor->debugfs_root, minor); |
|---|
| 229 | + drm_debugfs_create_files(hdlcd_debugfs_list, |
|---|
| 230 | + ARRAY_SIZE(hdlcd_debugfs_list), |
|---|
| 231 | + minor->debugfs_root, minor); |
|---|
| 227 | 232 | } |
|---|
| 228 | 233 | #endif |
|---|
| 229 | 234 | |
|---|
| 230 | 235 | DEFINE_DRM_GEM_CMA_FOPS(fops); |
|---|
| 231 | 236 | |
|---|
| 232 | 237 | static struct drm_driver hdlcd_driver = { |
|---|
| 233 | | - .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | |
|---|
| 234 | | - DRIVER_MODESET | DRIVER_PRIME | |
|---|
| 235 | | - DRIVER_ATOMIC, |
|---|
| 236 | | - .lastclose = drm_fb_helper_lastclose, |
|---|
| 238 | + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, |
|---|
| 237 | 239 | .irq_handler = hdlcd_irq, |
|---|
| 238 | 240 | .irq_preinstall = hdlcd_irq_preinstall, |
|---|
| 239 | 241 | .irq_postinstall = hdlcd_irq_postinstall, |
|---|
| 240 | 242 | .irq_uninstall = hdlcd_irq_uninstall, |
|---|
| 241 | | - .gem_free_object_unlocked = drm_gem_cma_free_object, |
|---|
| 242 | | - .gem_print_info = drm_gem_cma_print_info, |
|---|
| 243 | | - .gem_vm_ops = &drm_gem_cma_vm_ops, |
|---|
| 244 | | - .dumb_create = drm_gem_cma_dumb_create, |
|---|
| 245 | | - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, |
|---|
| 246 | | - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, |
|---|
| 247 | | - .gem_prime_export = drm_gem_prime_export, |
|---|
| 248 | | - .gem_prime_import = drm_gem_prime_import, |
|---|
| 249 | | - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, |
|---|
| 250 | | - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, |
|---|
| 251 | | - .gem_prime_vmap = drm_gem_cma_prime_vmap, |
|---|
| 252 | | - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, |
|---|
| 253 | | - .gem_prime_mmap = drm_gem_cma_prime_mmap, |
|---|
| 243 | + DRM_GEM_CMA_DRIVER_OPS, |
|---|
| 254 | 244 | #ifdef CONFIG_DEBUG_FS |
|---|
| 255 | 245 | .debugfs_init = hdlcd_debugfs_init, |
|---|
| 256 | 246 | #endif |
|---|
| .. | .. |
|---|
| 308 | 298 | drm_mode_config_reset(drm); |
|---|
| 309 | 299 | drm_kms_helper_poll_init(drm); |
|---|
| 310 | 300 | |
|---|
| 311 | | - ret = drm_fb_cma_fbdev_init(drm, 32, 0); |
|---|
| 312 | | - if (ret) |
|---|
| 313 | | - goto err_fbdev; |
|---|
| 314 | | - |
|---|
| 315 | 301 | ret = drm_dev_register(drm, 0); |
|---|
| 316 | 302 | if (ret) |
|---|
| 317 | 303 | goto err_register; |
|---|
| 318 | 304 | |
|---|
| 305 | + drm_fbdev_generic_setup(drm, 32); |
|---|
| 306 | + |
|---|
| 319 | 307 | return 0; |
|---|
| 320 | 308 | |
|---|
| 321 | 309 | err_register: |
|---|
| 322 | | - drm_fb_cma_fbdev_fini(drm); |
|---|
| 323 | | -err_fbdev: |
|---|
| 324 | 310 | drm_kms_helper_poll_fini(drm); |
|---|
| 325 | 311 | err_vblank: |
|---|
| 326 | 312 | pm_runtime_disable(drm->dev); |
|---|
| .. | .. |
|---|
| 346 | 332 | struct hdlcd_drm_private *hdlcd = drm->dev_private; |
|---|
| 347 | 333 | |
|---|
| 348 | 334 | drm_dev_unregister(drm); |
|---|
| 349 | | - drm_fb_cma_fbdev_fini(drm); |
|---|
| 350 | 335 | drm_kms_helper_poll_fini(drm); |
|---|
| 351 | 336 | component_unbind_all(dev, drm); |
|---|
| 352 | 337 | of_node_put(hdlcd->crtc.port); |
|---|
| 353 | 338 | hdlcd->crtc.port = NULL; |
|---|
| 354 | 339 | pm_runtime_get_sync(dev); |
|---|
| 355 | | - drm_crtc_vblank_off(&hdlcd->crtc); |
|---|
| 356 | | - drm_irq_uninstall(drm); |
|---|
| 357 | 340 | drm_atomic_helper_shutdown(drm); |
|---|
| 341 | + drm_irq_uninstall(drm); |
|---|
| 358 | 342 | pm_runtime_put(dev); |
|---|
| 359 | 343 | if (pm_runtime_enabled(dev)) |
|---|
| 360 | 344 | pm_runtime_disable(dev); |
|---|