Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for 5.1:

UAPI Changes:
 - New fourcc identifier for ARM Framebuffer Compression v1.3

Cross-subsystem Changes:

Core Changes:
 - Reorganisation of drm_device and drm_framebuffer headers
 - Cleanup of the drmP inclusion
 - Fix leaks in the fb-helpers
 - Allow for depth different from bpp in fb-helper fbdev emulation
 - Remove drm_mode_object from drm_display_mode

Driver Changes:
 - Add reflection properties to rockchip
 - a bunch of fixes for virtio
 - a bunch of fixes for dp_mst and drivers using it, and introduction of a
   new refcounting scheme
 - Convertion of bochs to atomic and generic fbdev emulation
 - Allow meson to remove the firmware framebuffers

[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190116200428.u2n4jbk4mzza7n6e@flea

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index e27c4aedb809..6bc2008b0d0d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -192,8 +192,16 @@ void virtio_gpu_dequeue_ctrl_func(struct work_struct *work)
 
         list_for_each_entry_safe(entry, tmp, &reclaim_list, list) {
                 resp = (struct virtio_gpu_ctrl_hdr *)entry->resp_buf;
-                if (resp->type != cpu_to_le32(VIRTIO_GPU_RESP_OK_NODATA))
-                        DRM_DEBUG("response 0x%x\n", le32_to_cpu(resp->type));
+                if (resp->type != cpu_to_le32(VIRTIO_GPU_RESP_OK_NODATA)) {
+                        if (resp->type >= cpu_to_le32(VIRTIO_GPU_RESP_ERR_UNSPEC)) {
+                                struct virtio_gpu_ctrl_hdr *cmd;
+                                cmd = (struct virtio_gpu_ctrl_hdr *)entry->buf;
+                                DRM_ERROR("response 0x%x (command 0x%x)\n",
+                                          le32_to_cpu(resp->type),
+                                          le32_to_cpu(cmd->type));
+                        } else
+                                DRM_DEBUG("response 0x%x\n", le32_to_cpu(resp->type));
+                }
                 if (resp->flags & cpu_to_le32(VIRTIO_GPU_FLAG_FENCE)) {
                         u64 f = le64_to_cpu(resp->fence_id);