On Tue, 8 Jun 2021 at 10:29, Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx> wrote: > > As we're about to add more ww-related functionality, > break out the dma_resv ww locking utilities to their own files > > Signed-off-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/Makefile | 1 + > drivers/gpu/drm/i915/gem/i915_gem_object.h | 1 + > drivers/gpu/drm/i915/gt/intel_renderstate.h | 1 + > drivers/gpu/drm/i915/i915_gem.c | 56 ------------------ > drivers/gpu/drm/i915/i915_gem.h | 12 ---- > drivers/gpu/drm/i915/i915_gem_ww.c | 63 +++++++++++++++++++++ > drivers/gpu/drm/i915/i915_gem_ww.h | 21 +++++++ > 7 files changed, 87 insertions(+), 68 deletions(-) > create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c > create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index 4f22cac1c49b..ea8ee4b3e018 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -45,6 +45,7 @@ i915-y += i915_drv.o \ > i915_switcheroo.o \ > i915_sysfs.o \ > i915_utils.o \ > + i915_gem_ww.o \ Nit: Should be kept sorted. > intel_device_info.o \ > intel_dram.o \ > intel_memory_region.o \ > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h > index 1fafcc89ecee..789529b424c1 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h > @@ -15,6 +15,7 @@ > #include "i915_gem_object_types.h" > #include "i915_gem_gtt.h" > #include "i915_vma_types.h" > +#include "i915_gem_ww.h" Same here. Reviewed-by: Matthew Auld <matthew.auld@xxxxxxxxx>
