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

Pulling in -rc2 fixes and TTM changes that next upcoming patches depend
on.

Signed-off-by: Joonas Lahtinen <[email protected]>

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

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

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

diff --cc drivers/gpu/drm/i915/gt/intel_gtt.h
index 86879af7b4a928c670d9cf7a1fd51b3f49ed6521,ca00b45827b7403d91c45f08e49cc7c322b5cf48..f39be66e84f605a5dde2677cb712bf8aa273f1e9
--- 1/drivers/gpu/drm/i915/gt/intel_gtt.h
--- 2/drivers/gpu/drm/i915/gt/intel_gtt.h
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.h
@@@ -245,11 -245,10 +245,12 @@@ struct i915_address_space 
        atomic_t open;
  
        struct mutex mutex; /* protects vma and our lists */
 -      struct dma_resv resv; /* reservation lock for all pd objects, and buffer pool */
 +
 +      struct kref resv_ref; /* kref to keep the reservation lock alive. */
 +      struct dma_resv _resv; /* reservation lock for all pd objects, and buffer pool */
  #define VM_CLASS_GGTT 0
  #define VM_CLASS_PPGTT 1
+ #define VM_CLASS_DPT 2
  
        struct drm_i915_gem_object *scratch[4];
        /**

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