Merge tag 'drm-misc-next-2018-07-04' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for 4.19:

UAPI Changes:
v3d: add fourcc modicfier for fourcc for the Broadcom UIF format (Eric Anholt)

Cross-subsystem Changes:
console/fbcon: Add support for deferred console takeover (Hans de Goede)

Core Changes:
dma-fence clean up, improvements and docs (Daniel Vetter)
add mask function for crtc, plane, encoder and connector DRM objects(Ville Syrjälä)

Driver Changes:
pl111: add Nomadik LCDC variant (Linus Walleij)

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180704234641.GA3981@juma

diff --combined drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index e74d620,2e9db0e..7056925
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@@ -376,7 -376,7 +376,7 @@@ int amdgpu_fence_driver_start_ring(stru
        struct amdgpu_device *adev = ring->adev;
        uint64_t index;
  
 -      if (ring != &adev->uvd.inst[ring->me].ring) {
 +      if (ring->funcs->type != AMDGPU_RING_TYPE_UVD) {
                ring->fence_drv.cpu_addr = &adev->wb.wb[ring->fence_offs];
                ring->fence_drv.gpu_addr = adev->wb.gpu_addr + (ring->fence_offs * 4);
        } else {
@@@ -646,7 -646,6 +646,6 @@@ static const struct dma_fence_ops amdgp
        .get_driver_name = amdgpu_fence_get_driver_name,
        .get_timeline_name = amdgpu_fence_get_timeline_name,
        .enable_signaling = amdgpu_fence_enable_signaling,
-       .wait = dma_fence_default_wait,
        .release = amdgpu_fence_release,
  };