| Message ID | 20210830121006.2978297-18-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Short-term pinning and async eviction. | expand |
On Mon, Aug 30, 2021 at 02:10:04PM +0200, Maarten Lankhorst wrote: >We want to get rid of i915_vma tracking to simplify the code and >lifetimes. Add a way to set/put the moving fence, in preparation for >removing the tracking. > >Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >--- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 15 +++++++++++++++ > drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++++++ > 2 files changed, 21 insertions(+) > >diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c >index 6fb9afb65034..dc0d2da297a0 100644 >--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c >+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c >@@ -32,6 +32,7 @@ > #include "i915_gem_object.h" > #include "i915_memcpy.h" > #include "i915_trace.h" >+#include "i915_gem_ttm.h" > > static struct kmem_cache *slab_objects; > >@@ -674,6 +675,20 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { > .export = i915_gem_prime_export, > }; > >+struct dma_fence * >+i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj) >+{ >+ return dma_fence_get(i915_gem_to_ttm(obj)->moving); >+} >+ >+void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, >+ struct dma_fence *fence) >+{ >+ dma_fence_put(i915_gem_to_ttm(obj)->moving); >+ >+ i915_gem_to_ttm(obj)->moving = dma_fence_get(fence); >+} When is i915_gem_object_set_moving_fence() called? I am not seeing it being called in this patch series. Niranjana >+ > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) > #include "selftests/huge_gem_object.c" > #include "selftests/huge_pages.c" >diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h >index 48112b9d76df..a23acfa98e21 100644 >--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h >+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h >@@ -520,6 +520,12 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj) > return engine; > } > >+struct dma_fence * >+i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj); >+ >+void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, >+ struct dma_fence *fence); >+ > void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, > unsigned int cache_level); > void i915_gem_object_flush_if_display(struct drm_i915_gem_object *obj); >-- >2.32.0 >
On 8/30/21 2:10 PM, Maarten Lankhorst wrote: > We want to get rid of i915_vma tracking to simplify the code and > lifetimes. Add a way to set/put the moving fence, in preparation for > removing the tracking. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 15 +++++++++++++++ > drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++++++ > 2 files changed, 21 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c > index 6fb9afb65034..dc0d2da297a0 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c > @@ -32,6 +32,7 @@ > #include "i915_gem_object.h" > #include "i915_memcpy.h" > #include "i915_trace.h" > +#include "i915_gem_ttm.h" > > static struct kmem_cache *slab_objects; > > @@ -674,6 +675,20 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { > .export = i915_gem_prime_export, > }; > > +struct dma_fence * > +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj) > +{ > + return dma_fence_get(i915_gem_to_ttm(obj)->moving); > +} > + > +void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, Two spaces after void? With that fixed: Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> > + struct dma_fence *fence) > +{ > + dma_fence_put(i915_gem_to_ttm(obj)->moving); > + > + i915_gem_to_ttm(obj)->moving = dma_fence_get(fence); > +} > + > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) > #include "selftests/huge_gem_object.c" > #include "selftests/huge_pages.c" > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h > index 48112b9d76df..a23acfa98e21 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h > @@ -520,6 +520,12 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj) > return engine; > } > > +struct dma_fence * > +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj); > + > +void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, > + struct dma_fence *fence); > + > void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, > unsigned int cache_level); > void i915_gem_object_flush_if_display(struct drm_i915_gem_object *obj);
Op 08-09-2021 om 06:08 schreef Niranjana Vishwanathapura: > On Mon, Aug 30, 2021 at 02:10:04PM +0200, Maarten Lankhorst wrote: >> We want to get rid of i915_vma tracking to simplify the code and >> lifetimes. Add a way to set/put the moving fence, in preparation for >> removing the tracking. >> >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >> --- >> drivers/gpu/drm/i915/gem/i915_gem_object.c | 15 +++++++++++++++ >> drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++++++ >> 2 files changed, 21 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c >> index 6fb9afb65034..dc0d2da297a0 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c >> @@ -32,6 +32,7 @@ >> #include "i915_gem_object.h" >> #include "i915_memcpy.h" >> #include "i915_trace.h" >> +#include "i915_gem_ttm.h" >> >> static struct kmem_cache *slab_objects; >> >> @@ -674,6 +675,20 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { >> .export = i915_gem_prime_export, >> }; >> >> +struct dma_fence * >> +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj) >> +{ >> + return dma_fence_get(i915_gem_to_ttm(obj)->moving); >> +} >> + >> +void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, >> + struct dma_fence *fence) >> +{ >> + dma_fence_put(i915_gem_to_ttm(obj)->moving); >> + >> + i915_gem_to_ttm(obj)->moving = dma_fence_get(fence); >> +} > > When is i915_gem_object_set_moving_fence() called? > I am not seeing it being called in this patch series. It's not called directly any more but it was in an earlier version; it could be removed but I kept it for now. TTM will set ttm_bo->moving directly in the callbacks, could drop this function if you want.
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 6fb9afb65034..dc0d2da297a0 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -32,6 +32,7 @@ #include "i915_gem_object.h" #include "i915_memcpy.h" #include "i915_trace.h" +#include "i915_gem_ttm.h" static struct kmem_cache *slab_objects; @@ -674,6 +675,20 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = { .export = i915_gem_prime_export, }; +struct dma_fence * +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj) +{ + return dma_fence_get(i915_gem_to_ttm(obj)->moving); +} + +void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, + struct dma_fence *fence) +{ + dma_fence_put(i915_gem_to_ttm(obj)->moving); + + i915_gem_to_ttm(obj)->moving = dma_fence_get(fence); +} + #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) #include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c" diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index 48112b9d76df..a23acfa98e21 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -520,6 +520,12 @@ i915_gem_object_last_write_engine(struct drm_i915_gem_object *obj) return engine; } +struct dma_fence * +i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj); + +void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, + struct dma_fence *fence); + void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, unsigned int cache_level); void i915_gem_object_flush_if_display(struct drm_i915_gem_object *obj);
We want to get rid of i915_vma tracking to simplify the code and lifetimes. Add a way to set/put the moving fence, in preparation for removing the tracking. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 15 +++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++++++ 2 files changed, 21 insertions(+)