From: Rob Clark Date: Tue, 6 Apr 2021 15:18:16 +0000 (-0700) Subject: drm/msm: Fix spelling "purgable" -> "purgeable" X-Git-Tag: microblaze-v5.14~4^2~8^2~58 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=0054eeb72ab63fd4007303c57748c79fcd285e7c;p=linux-2.6-microblaze.git drm/msm: Fix spelling "purgable" -> "purgeable" The previous patch fixes the user visible spelling. This one fixes the code. Oops. Signed-off-by: Rob Clark Link: https://lore.kernel.org/r/20210406151816.1515329-1-robdclark@gmail.com Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 9568d551f7de..3c0b384a8984 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -821,14 +821,14 @@ static void update_inactive(struct msm_gem_object *msm_obj) WARN_ON(msm_obj->active_count != 0); if (msm_obj->dontneed) - mark_unpurgable(msm_obj); + mark_unpurgeable(msm_obj); list_del(&msm_obj->mm_list); if (msm_obj->madv == MSM_MADV_WILLNEED) { list_add_tail(&msm_obj->mm_list, &priv->inactive_willneed); } else if (msm_obj->madv == MSM_MADV_DONTNEED) { list_add_tail(&msm_obj->mm_list, &priv->inactive_dontneed); - mark_purgable(msm_obj); + mark_purgeable(msm_obj); } else { WARN_ON(msm_obj->madv != __MSM_MADV_PURGED); list_add_tail(&msm_obj->mm_list, &priv->inactive_purged); @@ -901,8 +901,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, madv = " purged"; break; case MSM_MADV_DONTNEED: - stats->purgable.count++; - stats->purgable.size += obj->size; + stats->purgeable.count++; + stats->purgeable.size += obj->size; madv = " purgeable"; break; case MSM_MADV_WILLNEED: @@ -984,7 +984,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m) seq_printf(m, "Active: %4d objects, %9zu bytes\n", stats.active.count, stats.active.size); seq_printf(m, "Purgeable: %4d objects, %9zu bytes\n", - stats.purgable.count, stats.purgable.size); + stats.purgeable.count, stats.purgeable.size); seq_printf(m, "Purged: %4d objects, %9zu bytes\n", stats.purged.count, stats.purged.size); } @@ -1003,7 +1003,7 @@ void msm_gem_free_object(struct drm_gem_object *obj) mutex_lock(&priv->mm_lock); if (msm_obj->dontneed) - mark_unpurgable(msm_obj); + mark_unpurgeable(msm_obj); list_del(&msm_obj->mm_list); mutex_unlock(&priv->mm_lock); diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h index 7c7d54bad189..13ebecdd70f4 100644 --- a/drivers/gpu/drm/msm/msm_gem.h +++ b/drivers/gpu/drm/msm/msm_gem.h @@ -163,7 +163,7 @@ struct msm_gem_stats { struct { unsigned count; size_t size; - } all, active, purgable, purged; + } all, active, purgeable, purged; }; void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, @@ -207,8 +207,8 @@ static inline bool is_active(struct msm_gem_object *msm_obj) return msm_obj->active_count; } -/* imported/exported objects are not purgable: */ -static inline bool is_unpurgable(struct msm_gem_object *msm_obj) +/* imported/exported objects are not purgeable: */ +static inline bool is_unpurgeable(struct msm_gem_object *msm_obj) { return msm_obj->base.dma_buf && msm_obj->base.import_attach; } @@ -216,7 +216,7 @@ static inline bool is_unpurgable(struct msm_gem_object *msm_obj) static inline bool is_purgeable(struct msm_gem_object *msm_obj) { return (msm_obj->madv == MSM_MADV_DONTNEED) && msm_obj->sgt && - !is_unpurgable(msm_obj); + !is_unpurgeable(msm_obj); } static inline bool is_vunmapable(struct msm_gem_object *msm_obj) @@ -225,13 +225,13 @@ static inline bool is_vunmapable(struct msm_gem_object *msm_obj) return (msm_obj->vmap_count == 0) && msm_obj->vaddr; } -static inline void mark_purgable(struct msm_gem_object *msm_obj) +static inline void mark_purgeable(struct msm_gem_object *msm_obj) { struct msm_drm_private *priv = msm_obj->base.dev->dev_private; WARN_ON(!mutex_is_locked(&priv->mm_lock)); - if (is_unpurgable(msm_obj)) + if (is_unpurgeable(msm_obj)) return; if (WARN_ON(msm_obj->dontneed)) @@ -241,13 +241,13 @@ static inline void mark_purgable(struct msm_gem_object *msm_obj) msm_obj->dontneed = true; } -static inline void mark_unpurgable(struct msm_gem_object *msm_obj) +static inline void mark_unpurgeable(struct msm_gem_object *msm_obj) { struct msm_drm_private *priv = msm_obj->base.dev->dev_private; WARN_ON(!mutex_is_locked(&priv->mm_lock)); - if (is_unpurgable(msm_obj)) + if (is_unpurgeable(msm_obj)) return; if (WARN_ON(!msm_obj->dontneed)) diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c index 33a49641ef30..7101ca881ae1 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -49,7 +49,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) /* * Now that we own a reference, we can drop mm_lock for the * rest of the loop body, to reduce contention with the - * retire_submit path (which could make more objects purgable) + * retire_submit path (which could make more objects purgeable) */ mutex_unlock(&priv->mm_lock);