From: Joonas Lahtinen Date: Wed, 2 Jun 2021 07:18:45 +0000 (+0300) Subject: Merge drm/drm-next into drm-intel-gt-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=942baad211336efefb93a8369478888ab845c450;p=linux.git 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 --- 942baad211336efefb93a8369478888ab845c450 diff --cc drivers/gpu/drm/i915/gt/intel_gtt.h index 86879af7b4a92,ca00b45827b74..f39be66e84f60 --- a/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]; /**