| Message ID | 20230827175449.1766701-5-dmitry.osipenko@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add generic memory shrinker to VirtIO-GPU and Panfrost DRM drivers | expand |
On Sun, 27 Aug 2023 20:54:30 +0300 Dmitry Osipenko <dmitry.osipenko@collabora.com> wrote: > Add _locked postfix to drm_gem functions that have unlocked counterpart > functions to make GEM functions naming more consistent and intuitive in > regards to the locking requirements. > > Suggested-by: Boris Brezillon <boris.brezillon@collabora.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/gpu/drm/drm_gem.c | 6 +++--- > include/drm/drm_gem.h | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index fae5832bb0bd..8c0268944199 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -1488,10 +1488,10 @@ drm_gem_lru_scan(struct drm_gem_lru *lru, > EXPORT_SYMBOL(drm_gem_lru_scan); > > /** > - * drm_gem_evict - helper to evict backing pages for a GEM object > + * drm_gem_evict_locked - helper to evict backing pages for a GEM object > * @obj: obj in question > */ > -int drm_gem_evict(struct drm_gem_object *obj) > +int drm_gem_evict_locked(struct drm_gem_object *obj) > { > dma_resv_assert_held(obj->resv); > > @@ -1503,4 +1503,4 @@ int drm_gem_evict(struct drm_gem_object *obj) > > return 0; > } > -EXPORT_SYMBOL(drm_gem_evict); > +EXPORT_SYMBOL(drm_gem_evict_locked); > diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h > index f338f8cfacf7..e78e6d817451 100644 > --- a/include/drm/drm_gem.h > +++ b/include/drm/drm_gem.h > @@ -542,7 +542,7 @@ unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, > unsigned long *remaining, > bool (*shrink)(struct drm_gem_object *obj)); > > -int drm_gem_evict(struct drm_gem_object *obj); > +int drm_gem_evict_locked(struct drm_gem_object *obj); > > #ifdef CONFIG_LOCKDEP > /**
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index fae5832bb0bd..8c0268944199 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -1488,10 +1488,10 @@ drm_gem_lru_scan(struct drm_gem_lru *lru, EXPORT_SYMBOL(drm_gem_lru_scan); /** - * drm_gem_evict - helper to evict backing pages for a GEM object + * drm_gem_evict_locked - helper to evict backing pages for a GEM object * @obj: obj in question */ -int drm_gem_evict(struct drm_gem_object *obj) +int drm_gem_evict_locked(struct drm_gem_object *obj) { dma_resv_assert_held(obj->resv); @@ -1503,4 +1503,4 @@ int drm_gem_evict(struct drm_gem_object *obj) return 0; } -EXPORT_SYMBOL(drm_gem_evict); +EXPORT_SYMBOL(drm_gem_evict_locked); diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index f338f8cfacf7..e78e6d817451 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -542,7 +542,7 @@ unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, unsigned long *remaining, bool (*shrink)(struct drm_gem_object *obj)); -int drm_gem_evict(struct drm_gem_object *obj); +int drm_gem_evict_locked(struct drm_gem_object *obj); #ifdef CONFIG_LOCKDEP /**
Add _locked postfix to drm_gem functions that have unlocked counterpart functions to make GEM functions naming more consistent and intuitive in regards to the locking requirements. Suggested-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> --- drivers/gpu/drm/drm_gem.c | 6 +++--- include/drm/drm_gem.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)