Merge drm/drm-next into drm-intel-next

Sync up with upstream.

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

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/display/intel_frontbuffer.c
index b2744c5c3653adcb1f9537f26e25021974bbe147,7b38eee9980f19c5a85aa6659313ac6eeb063f94..6fc6965b613304304e9589624fad4c4175905e9d
--- 1/drivers/gpu/drm/i915/display/intel_frontbuffer.c
--- 2/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@@ -224,11 -224,11 +224,13 @@@ static void frontbuffer_release(struct 
        struct drm_i915_gem_object *obj = front->obj;
        struct i915_vma *vma;
  
 +      drm_WARN_ON(obj->base.dev, atomic_read(&front->bits));
 +
        spin_lock(&obj->vma.lock);
-       for_each_ggtt_vma(vma, obj)
+       for_each_ggtt_vma(vma, obj) {
+               i915_vma_clear_scanout(vma);
                vma->display_alignment = I915_GTT_MIN_ALIGNMENT;
+       }
        spin_unlock(&obj->vma.lock);
  
        RCU_INIT_POINTER(obj->frontbuffer, NULL);

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
Simple merge

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

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

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

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

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

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

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

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