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

drm/rcar-du: 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: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181128212713.43500-4-noralf@tronnes.org

+3 -34
+3 -11
drivers/gpu/drm/rcar-du/rcar_du_drv.c
··· 21 21 #include <drm/drm_atomic_helper.h> 22 22 #include <drm/drm_crtc_helper.h> 23 23 #include <drm/drm_fb_cma_helper.h> 24 + #include <drm/drm_fb_helper.h> 24 25 #include <drm/drm_gem_cma_helper.h> 25 26 26 27 #include "rcar_du_drv.h" ··· 393 392 * DRM operations 394 393 */ 395 394 396 - static void rcar_du_lastclose(struct drm_device *dev) 397 - { 398 - struct rcar_du_device *rcdu = dev->dev_private; 399 - 400 - drm_fbdev_cma_restore_mode(rcdu->fbdev); 401 - } 402 - 403 395 DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops); 404 396 405 397 static struct drm_driver rcar_du_driver = { 406 398 .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME 407 399 | DRIVER_ATOMIC, 408 - .lastclose = rcar_du_lastclose, 409 400 .gem_free_object_unlocked = drm_gem_cma_free_object, 410 401 .gem_vm_ops = &drm_gem_cma_vm_ops, 411 402 .prime_handle_to_fd = drm_gem_prime_handle_to_fd, ··· 452 459 struct drm_device *ddev = rcdu->ddev; 453 460 454 461 drm_dev_unregister(ddev); 455 - 456 - if (rcdu->fbdev) 457 - drm_fbdev_cma_fini(rcdu->fbdev); 458 462 459 463 drm_kms_helper_poll_fini(ddev); 460 464 drm_mode_config_cleanup(ddev); ··· 511 521 goto error; 512 522 513 523 DRM_INFO("Device %s probed\n", dev_name(&pdev->dev)); 524 + 525 + drm_fbdev_generic_setup(ddev, 32); 514 526 515 527 return 0; 516 528
-2
drivers/gpu/drm/rcar-du/rcar_du_drv.h
··· 20 20 struct clk; 21 21 struct device; 22 22 struct drm_device; 23 - struct drm_fbdev_cma; 24 23 struct rcar_du_device; 25 24 26 25 #define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK BIT(0) /* Per-CRTC IRQ and clock */ ··· 77 78 void __iomem *mmio; 78 79 79 80 struct drm_device *ddev; 80 - struct drm_fbdev_cma *fbdev; 81 81 82 82 struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS]; 83 83 unsigned int num_crtcs;
-21
drivers/gpu/drm/rcar-du/rcar_du_kms.c
··· 255 255 return drm_gem_fb_create(dev, file_priv, mode_cmd); 256 256 } 257 257 258 - static void rcar_du_output_poll_changed(struct drm_device *dev) 259 - { 260 - struct rcar_du_device *rcdu = dev->dev_private; 261 - 262 - drm_fbdev_cma_hotplug_event(rcdu->fbdev); 263 - } 264 - 265 258 /* ----------------------------------------------------------------------------- 266 259 * Atomic Check and Update 267 260 */ ··· 301 308 302 309 static const struct drm_mode_config_funcs rcar_du_mode_config_funcs = { 303 310 .fb_create = rcar_du_fb_create, 304 - .output_poll_changed = rcar_du_output_poll_changed, 305 311 .atomic_check = rcar_du_atomic_check, 306 312 .atomic_commit = drm_atomic_helper_commit, 307 313 }; ··· 535 543 536 544 struct drm_device *dev = rcdu->ddev; 537 545 struct drm_encoder *encoder; 538 - struct drm_fbdev_cma *fbdev; 539 546 unsigned int dpad0_sources; 540 547 unsigned int num_encoders; 541 548 unsigned int num_groups; ··· 672 681 drm_mode_config_reset(dev); 673 682 674 683 drm_kms_helper_poll_init(dev); 675 - 676 - if (dev->mode_config.num_connector) { 677 - fbdev = drm_fbdev_cma_init(dev, 32, 678 - dev->mode_config.num_connector); 679 - if (IS_ERR(fbdev)) 680 - return PTR_ERR(fbdev); 681 - 682 - rcdu->fbdev = fbdev; 683 - } else { 684 - dev_info(rcdu->dev, 685 - "no connector found, disabling fbdev emulation\n"); 686 - } 687 684 688 685 return 0; 689 686 }