Commit bb7e9833 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm/atmel-hlcdc/for-4.11' of...

Merge tag 'drm/atmel-hlcdc/for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bbrezillon/linux into drm-next

Contains a single patch to create the fbdev at driver's registration
time instead of waiting for the connector status change.

* tag 'drm/atmel-hlcdc/for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bbrezillon/linux:
  drm/atmel-hlcdc: Rework the fbdev creation logic
parents 3a5e6bb9 db02b761
...@@ -431,15 +431,8 @@ static void atmel_hlcdc_fb_output_poll_changed(struct drm_device *dev) ...@@ -431,15 +431,8 @@ static void atmel_hlcdc_fb_output_poll_changed(struct drm_device *dev)
{ {
struct atmel_hlcdc_dc *dc = dev->dev_private; struct atmel_hlcdc_dc *dc = dev->dev_private;
if (dc->fbdev) { if (dc->fbdev)
drm_fbdev_cma_hotplug_event(dc->fbdev); drm_fbdev_cma_hotplug_event(dc->fbdev);
} else {
dc->fbdev = drm_fbdev_cma_init(dev, 24,
dev->mode_config.num_crtc,
dev->mode_config.num_connector);
if (IS_ERR(dc->fbdev))
dc->fbdev = NULL;
}
} }
struct atmel_hlcdc_dc_commit { struct atmel_hlcdc_dc_commit {
...@@ -653,10 +646,13 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) ...@@ -653,10 +646,13 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev)
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
drm_kms_helper_poll_init(dev); dc->fbdev = drm_fbdev_cma_init(dev, 24,
dev->mode_config.num_crtc,
dev->mode_config.num_connector);
if (IS_ERR(dc->fbdev))
dc->fbdev = NULL;
/* force connectors detection */ drm_kms_helper_poll_init(dev);
drm_helper_hpd_irq_event(dev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment