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

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index ead5c53d4e21..024c2aa0c929 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -130,11 +130,12 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
                                    plane->state->src_h >> 16,
                                    plane->state->src_x >> 16,
                                    plane->state->src_y >> 16);
-        virtio_gpu_cmd_resource_flush(vgdev, handle,
-                                      plane->state->src_x >> 16,
-                                      plane->state->src_y >> 16,
-                                      plane->state->src_w >> 16,
-                                      plane->state->src_h >> 16);
+        if (handle)
+                virtio_gpu_cmd_resource_flush(vgdev, handle,
+                                              plane->state->src_x >> 16,
+                                              plane->state->src_y >> 16,
+                                              plane->state->src_w >> 16,
+                                              plane->state->src_h >> 16);
 }
 
 static int virtio_gpu_cursor_prepare_fb(struct drm_plane *plane,
@@ -168,8 +169,10 @@ static void virtio_gpu_cursor_cleanup_fb(struct drm_plane *plane,
                 return;
 
         vgfb = to_virtio_gpu_framebuffer(plane->state->fb);
-        if (vgfb->fence)
-                virtio_gpu_fence_cleanup(vgfb->fence);
+        if (vgfb->fence) {
+                dma_fence_put(&vgfb->fence->f);
+                vgfb->fence = NULL;
+        }
 }
 
 static void virtio_gpu_cursor_plane_update(struct drm_plane *plane,