Merge tag 'drm-misc-next-2018-09-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 4.20:

UAPI Changes:
- None

Cross-subsystem Changes:
- MAINTAINERS: Move udl, mxsfb, and fsl-dcu into drm-misc (Stefan, Sean)

Core Changes:
- syncobj: Check condition before returning timeout in schedule() (Chris)

Driver Changes:
- various: First wave of drm_fbdev_generic_setup() conversions (Noralf)
- bochs/virtio: More format byte-order improvements (Gerd)
- mxsfb: A couple fixes + add runtime pm support (Leonard)
- virtio: Add vmap support for prime objects (Ezequiel)

Cc: Stefan Agner <stefan@agner.ch>
Cc: Sean Paul <sean@poorly.run>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Gerd Hoffman <kraxel@redhat.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927093950.GA180365@art_vandelay

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index 0ed1cde98cf8..dfad8d06d108 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -103,7 +103,6 @@ setup_fail:
 
 static const struct drm_mode_config_funcs hdlcd_mode_config_funcs = {
         .fb_create = drm_gem_fb_create,
-        .output_poll_changed = drm_fb_helper_output_poll_changed,
         .atomic_check = drm_atomic_helper_check,
         .atomic_commit = drm_atomic_helper_commit,
 };
@@ -233,7 +232,6 @@ static struct drm_driver hdlcd_driver = {
         .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM |
                            DRIVER_MODESET | DRIVER_PRIME |
                            DRIVER_ATOMIC,
-        .lastclose = drm_fb_helper_lastclose,
         .irq_handler = hdlcd_irq,
         .irq_preinstall = hdlcd_irq_preinstall,
         .irq_postinstall = hdlcd_irq_postinstall,
@@ -308,19 +306,15 @@ static int hdlcd_drm_bind(struct device *dev)
         drm_mode_config_reset(drm);
         drm_kms_helper_poll_init(drm);
 
-        ret = drm_fb_cma_fbdev_init(drm, 32, 0);
-        if (ret)
-                goto err_fbdev;
-
         ret = drm_dev_register(drm, 0);
         if (ret)
                 goto err_register;
 
+        drm_fbdev_generic_setup(drm, 32);
+
         return 0;
 
 err_register:
-        drm_fb_cma_fbdev_fini(drm);
-err_fbdev:
         drm_kms_helper_poll_fini(drm);
 err_vblank:
         pm_runtime_disable(drm->dev);
@@ -346,7 +340,6 @@ static void hdlcd_drm_unbind(struct device *dev)
         struct hdlcd_drm_private *hdlcd = drm->dev_private;
 
         drm_dev_unregister(drm);
-        drm_fb_cma_fbdev_fini(drm);
         drm_kms_helper_poll_fini(drm);
         component_unbind_all(dev, drm);
         of_node_put(hdlcd->crtc.port);