Merge drm-upstream/drm-next into drm-intel-next-queued

Need MST sideband message transaction to power up/down nodes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/i915/gvt/cmd_parser.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_userptr.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gpu_error.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index aa9ccc3ecff9fc3da67374d8a21a01f8554a1d04,f780f39e0758c646dae633ce93306892c667f480..c4b224a3a0ee4349187d3d8cd582b9e8b41e0682
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -12367,8 -12298,8 +12299,7 @@@ static void intel_atomic_commit_tail(st
        struct drm_crtc_state *old_crtc_state, *new_crtc_state;
        struct drm_crtc *crtc;
        struct intel_crtc_state *intel_cstate;
 -      bool hw_check = intel_state->modeset;
        u64 put_domains[I915_MAX_PIPES] = {};
-       unsigned crtc_vblank_mask = 0;
        int i;
  
        intel_atomic_commit_fence_wait(intel_state);

diff --cc drivers/gpu/drm/i915/selftests/i915_random.c
Simple merge

diff --cc drivers/media/v4l2-core/videobuf2-dma-contig.c
index 2405077fdc716aadad9bebd238ad21c8cf178cfa,9f389f36566de38eade18dfe008be0c314908346..a9806ba6116dec553be8f06141b5e6d314a8996c
--- 1/drivers/media/v4l2-core/videobuf2-dma-contig.c
--- 2/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@@ -507,8 -507,9 +507,9 @@@ static void *vb2_dc_get_userptr(struct 
        buf->dev = dev;
        buf->dma_dir = dma_dir;
  
 -      offset = vaddr & ~PAGE_MASK;
 +      offset = lower_32_bits(offset_in_page(vaddr));
-       vec = vb2_create_framevec(vaddr, size, dma_dir == DMA_FROM_DEVICE);
+       vec = vb2_create_framevec(vaddr, size, dma_dir == DMA_FROM_DEVICE ||
+                                              dma_dir == DMA_BIDIRECTIONAL);
        if (IS_ERR(vec)) {
                ret = PTR_ERR(vec);
                goto fail_buf;