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, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index b424bc911b95..8cdb610561ba 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1189,16 +1189,16 @@ static int host1x_drm_probe(struct host1x_device *dev)
 
         err = drm_fb_helper_remove_conflicting_framebuffers(NULL, "tegradrmfb", false);
         if (err < 0)
-                goto unref;
+                goto put;
 
         err = drm_dev_register(drm, 0);
         if (err < 0)
-                goto unref;
+                goto put;
 
         return 0;
 
-unref:
-        drm_dev_unref(drm);
+put:
+        drm_dev_put(drm);
         return err;
 }
 
@@ -1207,7 +1207,7 @@ static int host1x_drm_remove(struct host1x_device *dev)
         struct drm_device *drm = dev_get_drvdata(&dev->dev);
 
         drm_dev_unregister(drm);
-        drm_dev_unref(drm);
+        drm_dev_put(drm);
 
         return 0;
 }