From: Jani Nikula Date: Thu, 28 Sep 2017 12:56:49 +0000 (+0300) Subject: Merge drm-upstream/drm-next into drm-intel-next-queued X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=32f35b863451884e856f0f577474740561a87fad;p=openwrt%2Fstaging%2Fblogic.git 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 --- 32f35b863451884e856f0f577474740561a87fad diff --cc drivers/gpu/drm/i915/intel_display.c index aa9ccc3ecff9,f780f39e0758..c4b224a3a0ee --- a/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/media/v4l2-core/videobuf2-dma-contig.c index 2405077fdc71,9f389f36566d..a9806ba6116d --- a/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;