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

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 66493178ffcf..a504a5e05676 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -2843,7 +2843,7 @@ int drm_fb_helper_fbdev_setup(struct drm_device *dev,
         if (!max_conn_count)
                 max_conn_count = dev->mode_config.num_connector;
         if (!max_conn_count) {
-                DRM_DEV_ERROR(dev->dev, "No connectors\n");
+                DRM_DEV_ERROR(dev->dev, "fbdev: No connectors\n");
                 return -EINVAL;
         }
 
@@ -2851,13 +2851,13 @@ int drm_fb_helper_fbdev_setup(struct drm_device *dev,
 
         ret = drm_fb_helper_init(dev, fb_helper, max_conn_count);
         if (ret < 0) {
-                DRM_DEV_ERROR(dev->dev, "Failed to initialize fbdev helper\n");
+                DRM_DEV_ERROR(dev->dev, "fbdev: Failed to initialize (ret=%d)\n", ret);
                 return ret;
         }
 
         ret = drm_fb_helper_single_add_all_connectors(fb_helper);
         if (ret < 0) {
-                DRM_DEV_ERROR(dev->dev, "Failed to add connectors\n");
+                DRM_DEV_ERROR(dev->dev, "fbdev: Failed to add connectors (ret=%d)\n", ret);
                 goto err_drm_fb_helper_fini;
         }
 
@@ -2866,7 +2866,7 @@ int drm_fb_helper_fbdev_setup(struct drm_device *dev,
 
         ret = drm_fb_helper_initial_config(fb_helper, preferred_bpp);
         if (ret < 0) {
-                DRM_DEV_ERROR(dev->dev, "Failed to set fbdev configuration\n");
+                DRM_DEV_ERROR(dev->dev, "fbdev: Failed to set configuration (ret=%d)\n", ret);
                 goto err_drm_fb_helper_fini;
         }