diff options
Diffstat (limited to 'drivers/gpu/drm/tilcdc')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index d642d4a02134..c73588483be0 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "drm_flip_work.h" | 18 | #include "drm_flip_work.h" |
| 19 | #include <drm/drm_plane_helper.h> | ||
| 19 | 20 | ||
| 20 | #include "tilcdc_drv.h" | 21 | #include "tilcdc_drv.h" |
| 21 | #include "tilcdc_regs.h" | 22 | #include "tilcdc_regs.h" |
| @@ -664,12 +665,8 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev) | |||
| 664 | tilcdc_crtc->dpms = DRM_MODE_DPMS_OFF; | 665 | tilcdc_crtc->dpms = DRM_MODE_DPMS_OFF; |
| 665 | init_waitqueue_head(&tilcdc_crtc->frame_done_wq); | 666 | init_waitqueue_head(&tilcdc_crtc->frame_done_wq); |
| 666 | 667 | ||
| 667 | ret = drm_flip_work_init(&tilcdc_crtc->unref_work, 16, | 668 | drm_flip_work_init(&tilcdc_crtc->unref_work, |
| 668 | "unref", unref_worker); | 669 | "unref", unref_worker); |
| 669 | if (ret) { | ||
| 670 | dev_err(dev->dev, "could not allocate unref FIFO\n"); | ||
| 671 | goto fail; | ||
| 672 | } | ||
| 673 | 670 | ||
| 674 | ret = drm_crtc_init(dev, crtc, &tilcdc_crtc_funcs); | 671 | ret = drm_crtc_init(dev, crtc, &tilcdc_crtc_funcs); |
| 675 | if (ret < 0) | 672 | if (ret < 0) |
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 79a34cbd29f5..095fca91525c 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c | |||
| @@ -58,8 +58,7 @@ static struct drm_framebuffer *tilcdc_fb_create(struct drm_device *dev, | |||
| 58 | static void tilcdc_fb_output_poll_changed(struct drm_device *dev) | 58 | static void tilcdc_fb_output_poll_changed(struct drm_device *dev) |
| 59 | { | 59 | { |
| 60 | struct tilcdc_drm_private *priv = dev->dev_private; | 60 | struct tilcdc_drm_private *priv = dev->dev_private; |
| 61 | if (priv->fbdev) | 61 | drm_fbdev_cma_hotplug_event(priv->fbdev); |
| 62 | drm_fbdev_cma_hotplug_event(priv->fbdev); | ||
| 63 | } | 62 | } |
| 64 | 63 | ||
| 65 | static const struct drm_mode_config_funcs mode_config_funcs = { | 64 | static const struct drm_mode_config_funcs mode_config_funcs = { |
| @@ -645,7 +644,6 @@ static struct platform_driver tilcdc_platform_driver = { | |||
| 645 | .probe = tilcdc_pdev_probe, | 644 | .probe = tilcdc_pdev_probe, |
| 646 | .remove = tilcdc_pdev_remove, | 645 | .remove = tilcdc_pdev_remove, |
| 647 | .driver = { | 646 | .driver = { |
| 648 | .owner = THIS_MODULE, | ||
| 649 | .name = "tilcdc", | 647 | .name = "tilcdc", |
| 650 | .pm = &tilcdc_pm_ops, | 648 | .pm = &tilcdc_pm_ops, |
| 651 | .of_match_table = tilcdc_of_match, | 649 | .of_match_table = tilcdc_of_match, |
