drm/i915: Unify global_list into global_link
Subsystems (2)
Joonas Lahtinen
maintainerPATCH 1/1 drm/i915: Unify global_list into global_link
$ sed -i -r 's/\bglobal_list\b/global_link/g' *.c *.h
--- drivers/gpu/drm/i915/i915_debugfs.c | 10 +++++----- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 12 ++++++------ drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_shrinker.c | 16 ++++++++-------- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +5 -5
@@ -217,7 +217,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data)return ret; total_obj_size = total_gtt_size = count =0 ; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.bound_list, global_link) {if (obj->stolen ==NULL )continue ;
@@ -227,7 +227,7 @@ static int i915_gem_stolen_list_info(struct seq_file *m, void *data) total_gtt_size +=i915_gem_obj_total_ggtt_size (obj); count++; } -list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_link) {if (obj->stolen ==NULL )continue ;
@@ -390,7 +390,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data) size = count =0 ; mapped_size = mapped_count =0 ; purgeable_size = purgeable_count =0 ; -list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_link) { size += obj->base.size; ++count;
@@ -407,7 +407,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data)seq_printf (m,"%u unbound objects, %llu bytes\n" , count, size); size = count = dpy_size = dpy_count =0 ; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.bound_list, global_link) { size += obj->base.size; ++count;
@@ -493,7 +493,7 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)return ret; total_obj_size = total_gtt_size = count =0 ; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.bound_list, global_link) {if (show_pin_display_only && !obj->pin_display)continue ;
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2235,7 +2235,7 @@ struct drm_i915_gem_object {/** Stolen memory for this object, instead of being backed by shmem. */ struct drm_mm_node *stolen; -struct list_head global_list; +struct list_head global_link;union {struct rcu_head rcu;struct llist_node freed;
drivers/gpu/drm/i915/i915_gem.c +6 -6
@@ -1446,7 +1446,7 @@ static void i915_gem_object_bump_inactive_ggtt(struct drm_i915_gem_object *obj) i915 =to_i915 (obj->base.dev); list = obj->bind_count ? &i915->mm.bound_list : &i915->mm.unbound_list; -list_move_tail (&obj->global_list, list); +list_move_tail (&obj->global_link, list); }/**
@@ -2967,7 +2967,7 @@ int i915_vma_unbind(struct i915_vma *vma)/* Since the unbound list is global, only move to that list if * no more VMAs exist. */ if (--obj->bind_count ==0 ) -list_move_tail (&obj->global_list, +list_move_tail (&obj->global_link, &to_i915 (obj->base.dev)->mm.unbound_list);/* And finally now the object is completely decoupled from this vma,
@@ -3164,7 +3164,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags) }GEM_BUG_ON (!i915_gem_valid_gtt_space (vma, obj->cache_level)); -list_move_tail (&obj->global_list, &dev_priv->mm.bound_list); +list_move_tail (&obj->global_link, &dev_priv->mm.bound_list);list_move_tail (&vma->vm_link, &vma->vm->inactive_list); obj->bind_count++;
@@ -4125,7 +4125,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, {mutex_init (&obj->mm.lock); -INIT_LIST_HEAD (&obj->global_list); +INIT_LIST_HEAD (&obj->global_link);INIT_LIST_HEAD (&obj->userfault_link);INIT_LIST_HEAD (&obj->obj_exec_link);INIT_LIST_HEAD (&obj->vma_list);
@@ -4272,7 +4272,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,GEM_BUG_ON (!list_empty (&obj->vma_list));GEM_BUG_ON (!RB_EMPTY_ROOT (&obj->vma_tree)); -list_del (&obj->global_list); +list_del (&obj->global_link); }intel_runtime_pm_put (i915);mutex_unlock (&i915->drm.struct_mutex);
@@ -4847,7 +4847,7 @@ int i915_gem_freeze_late(struct drm_i915_private *dev_priv)i915_gem_shrink (dev_priv,-1UL ,I915_SHRINK_UNBOUND );for (p = phases; *p; p++) { -list_for_each_entry (obj, *p, global_list) { +list_for_each_entry (obj, *p, global_link) { obj->base.read_domains =I915_GEM_DOMAIN_CPU ; obj->base.write_domain =I915_GEM_DOMAIN_CPU ; }
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
@@ -3296,7 +3296,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)/* clflush objects bound into the GGTT and rebind them. */ list_for_each_entry_safe (obj, on, - &dev_priv->mm.bound_list, global_list) { + &dev_priv->mm.bound_list, global_link) {bool ggtt_bound = false;struct i915_vma *vma;
@@ -3376,7 +3376,7 @@ i915_vma_retire(struct i915_gem_active *active,* (unless we are forced to ofc!) */ if (obj->bind_count) -list_move_tail (&obj->global_list, &rq->i915->mm.bound_list); +list_move_tail (&obj->global_link, &rq->i915->mm.bound_list); obj->mm.dirty = true;/* be paranoid */
drivers/gpu/drm/i915/i915_gem_shrinker.c +8 -8
@@ -199,10 +199,10 @@ i915_gem_shrink(struct drm_i915_private *dev_priv,while (count < target && (obj =list_first_entry_or_null (phase->list,typeof (*obj), - global_list))) { -list_move_tail (&obj->global_list, &still_in_list); + global_link))) { +list_move_tail (&obj->global_link, &still_in_list);if (!obj->mm.pages) { -list_del_init (&obj->global_list); +list_del_init (&obj->global_link);continue ; }
@@ -228,7 +228,7 @@ i915_gem_shrink(struct drm_i915_private *dev_priv, I915_MM_SHRINKER);if (!obj->mm.pages) {__i915_gem_object_invalidate (obj); -list_del_init (&obj->global_list); +list_del_init (&obj->global_link); count += obj->base.size >>PAGE_SHIFT ; }mutex_unlock (&obj->mm.lock);
@@ -293,11 +293,11 @@ i915_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc)i915_gem_retire_requests (dev_priv); count =0 ; -list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_list) +list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_link)if (can_release_pages (obj)) count += obj->base.size >>PAGE_SHIFT ; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.bound_list, global_link) {if (!i915_gem_object_is_active (obj) &&can_release_pages (obj)) count += obj->base.size >>PAGE_SHIFT ; }
@@ -398,7 +398,7 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)* being pointed to by hardware. */ unbound = bound = unevictable =0 ; -list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.unbound_list, global_link) {if (!obj->mm.pages)continue ;
@@ -407,7 +407,7 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)else unbound += obj->base.size >>PAGE_SHIFT ; } -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { +list_for_each_entry (obj, &dev_priv->mm.bound_list, global_link) {if (!obj->mm.pages)continue ;
drivers/gpu/drm/i915/i915_gem_stolen.c +1 -1
@@ -723,7 +723,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev, vma->flags |=I915_VMA_GLOBAL_BIND ;__i915_vma_set_map_and_fenceable (vma);list_move_tail (&vma->vm_link, &ggtt->base.inactive_list); -list_move_tail (&obj->global_list, &dev_priv->mm.bound_list); +list_move_tail (&obj->global_link, &dev_priv->mm.bound_list); obj->bind_count++;return obj;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Joonas Lahtinen
$ sed -i -r 's/\bglobal_list\b/global_link/g' *.c *.hCc Chris Wilson <[email protected]>Signed-off-by Joonas Lahtinen <[email protected]>
Ok, I keep trying to find a better name than global_*, but it falls into the "when we fix the shrinker" category.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: Unify global_list into global_link
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: drm/i915: Unify global_list into global_link
URL : https://patchwork.freedesktop.org/series/14722/
State : warning
== Summary ==
Series 14722v1 drm/i915: Unify global_list into global_link
https://patchwork.freedesktop.org/api/1.0/series/14722/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> DMESG-WARN (fi-skl-6770hq)
Test gem_ctx_switch:
Subgroup basic-default:
timeout -> PASS (fi-bsw-n3050)
Subgroup basic-default-heavy:
incomplete -> PASS (fi-bsw-n3050)fi-bdw-5557u total:241 pass:226 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:241 pass:201 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:241 pass:213 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:241 pass:213 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:241 pass:209 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:241 pass:221 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:241 pass:220 dwarn:0 dfail:0 fail:0 skip:21 fi-ilk-650 total:241 pass:187 dwarn:0 dfail:0 fail:0 skip:54 fi-ivb-3520m total:241 pass:218 dwarn:0 dfail:0 fail:0 skip:23 fi-ivb-3770 total:241 pass:218 dwarn:0 dfail:0 fail:0 skip:23 fi-kbl-7200u total:241 pass:219 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:241 pass:227 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:241 pass:220 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:241 pass:219 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:241 pass:226 dwarn:1 dfail:0 fail:0 skip:14 fi-snb-2520m total:241 pass:208 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:241 pass:207 dwarn:0 dfail:0 fail:0 skip:34
179f2b207ffc86fad387e7d102912b6c897abc4e drm-intel-nightly: 2016y-11m-02d-10h-06m-52s UTC integration manifest a52f61d drm/i915: Unify global_list into global_link
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2888/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✗ Fi.CI.BAT: warning for drm/i915: Unify global_list into global_link
Quoted 6 lines · Patchwork
== Series Details ==
Series: drm/i915: Unify
global_listintoglobal_linkURL : https://patchwork.freedesktop.org/series/14722/
State : warning
Quoted 7 lines
== Summary ==
Series 14722v1 drm/i915: Unify
global_listintoglobal_link
https://patchwork.freedesktop.org/api/1.0/series/14722/revisions/1/mbox/Test
drv_module_reload_basic:
pass -> DMESG-WARN (fi-skl-6770hq)
Re-opened;
https://bugs.freedesktop.org/show_bug.cgi?id=98353
Merging the patch, thanks for review.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx