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, 6 insertions, 8 deletions

diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c
index ac344ddb23bc..72efcecb44f7 100644
--- a/drivers/gpu/drm/tve200/tve200_drv.c
+++ b/drivers/gpu/drm/tve200/tve200_drv.c
@@ -126,12 +126,6 @@ static int tve200_modeset_init(struct drm_device *dev)
         }
 
         drm_mode_config_reset(dev);
-
-        /*
-         * Passing in 16 here will make the RGB656 mode the default
-         * Passing in 32 will use XRGB8888 mode
-         */
-        drm_fb_cma_fbdev_init(dev, 16, 0);
         drm_kms_helper_poll_init(dev);
 
         goto finish;
@@ -149,7 +143,6 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
 static struct drm_driver tve200_drm_driver = {
         .driver_features =
                 DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC,
-        .lastclose = drm_fb_helper_lastclose,
         .ioctls = NULL,
         .fops = &drm_fops,
         .name = "tve200",
@@ -245,6 +238,12 @@ static int tve200_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto clk_disable;
 
+        /*
+         * Passing in 16 here will make the RGB565 mode the default
+         * Passing in 32 will use XRGB8888 mode
+         */
+        drm_fbdev_generic_setup(drm, 16);
+
         return 0;
 
 clk_disable:
@@ -260,7 +259,6 @@ static int tve200_remove(struct platform_device *pdev)
         struct tve200_drm_dev_private *priv = drm->dev_private;
 
         drm_dev_unregister(drm);
-        drm_fb_cma_fbdev_fini(drm);
         if (priv->panel)
                 drm_panel_bridge_remove(priv->bridge);
         drm_mode_config_cleanup(drm);