drm/i915: add i915_address_space_fini
Subsystems (2)
PATCH 1/1 drm/i915: add i915_address_space_fini
We already have an i915_address_space_init, so for symmetry we should also have a _fini, plus we already open code it twice. This then also fixes a bug where we leak the timeline for the ggtt vm.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +10 -7
@@ -2193,6 +2193,13 @@ static void i915_address_space_init(struct i915_address_space *vm,list_add_tail (&vm->global_link, &dev_priv->vm_list); } +static void i915_address_space_fini (struct i915_address_space *vm) +{ +i915_gem_timeline_fini (&vm->timeline); +drm_mm_takedown (&vm->mm); +list_del (&vm->global_link); +} +static void gtt_write_workarounds (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -2279,7 +2286,7 @@ i915_ppgtt_create(struct drm_i915_private *dev_priv,return ppgtt; } -void i915_ppgtt_release (struct kref *kref) +void i915_ppgtt_release (struct kref *kref) {struct i915_hw_ppgtt *ppgtt = container_of(kref, struct i915_hw_ppgtt, ref);
@@ -2291,9 +2298,7 @@ void i915_ppgtt_release(struct kref *kref)WARN_ON (!list_empty (&ppgtt->base.inactive_list));WARN_ON (!list_empty (&ppgtt->base.unbound_list)); -i915_gem_timeline_fini (&ppgtt->base.timeline); -list_del (&ppgtt->base.global_link); -drm_mm_takedown (&ppgtt->base.mm); +i915_address_space_fini (&ppgtt->base); ppgtt->base.cleanup (&ppgtt->base);kfree (ppgtt);
@@ -2834,9 +2839,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)if (drm_mm_initialized (&ggtt->base.mm)) {intel_vgt_deballoon (dev_priv); - -drm_mm_takedown (&ggtt->base.mm); -list_del (&ggtt->base.global_link); +i915_address_space_fini (&ggtt->base); } ggtt->base.cleanup (&ggtt->base);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: add i915_address_space_fini
== Series Details ==
== Series Details ==
Series: drm/i915: add i915_address_space_fini
URL : https://patchwork.freedesktop.org/series/15437/
State : warning
== Summary ==
Series 15437v1 drm/i915: add i915_address_space_fini
https://patchwork.freedesktop.org/api/1.0/series/15437/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> DMESG-WARN (fi-bsw-n3050)
pass -> DMESG-WARN (fi-skl-6700hq)
pass -> DMESG-WARN (fi-ivb-3770)
pass -> DMESG-WARN (fi-hsw-4770r)
pass -> DMESG-WARN (fi-ilk-650)
pass -> DMESG-WARN (fi-hsw-4770)
pass -> DMESG-WARN (fi-snb-2600)
pass -> DMESG-WARN (fi-ivb-3520m)
pass -> DMESG-WARN (fi-skl-6770hq)
pass -> DMESG-WARN (fi-skl-6260u)
pass -> DMESG-WARN (fi-bxt-t5700)
pass -> DMESG-WARN (fi-byt-j1900)
pass -> DMESG-WARN (fi-byt-n2820)
pass -> DMESG-WARN (fi-snb-2520m)
pass -> DMESG-WARN (fi-bdw-5557u)
pass -> DMESG-WARN (fi-kbl-7200u)
Test gem_busy:
Subgroup basic-hang-default:
pass -> DMESG-WARN (fi-hsw-4770r)fi-bdw-5557u total:244 pass:228 dwarn:1 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:203 dwarn:1 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:215 dwarn:1 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:215 dwarn:1 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:223 dwarn:1 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:222 dwarn:2 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:190 dwarn:1 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:221 dwarn:1 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:229 dwarn:1 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:244 pass:229 dwarn:1 dfail:0 fail:0 skip:14 fi-snb-2520m total:244 pass:211 dwarn:1 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:210 dwarn:1 dfail:0 fail:0 skip:33
6294f67611ebe69006c0e85c372efadcac8e9d66 drm-intel-nightly: 2016y-11m-16d-09h-57m-25s UTC integration manifest da8acad drm/i915: add i915_address_space_fini
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3027/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Matthew Auld
We already have an
i915_address_space_init, so for symmetry we should also have a_fini, plus we already open code it twice. This then also fixes a bug where we leak the timeline for the ggtt vm.Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +9
-4@@ -2193,6 +2193,13 @@ static void i915_address_space_init(struct i915_address_space *vm,list_add_tail (&vm->global_link, &dev_priv->vm_list); } +static void i915_address_space_fini (struct i915_address_space *vm) +{ +i915_gem_timeline_fini (&vm->timeline); +drm_mm_takedown (&vm->mm); +list_del (&vm->global_link); +} +static void gtt_write_workarounds (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);@@ -2279,7 +2286,7 @@ i915_ppgtt_create(struct drm_i915_private *dev_priv,return ppgtt; } -void i915_ppgtt_release (struct kref *kref) +void i915_ppgtt_release (struct kref *kref) {struct i915_hw_ppgtt *ppgtt = container_of(kref, struct i915_hw_ppgtt, ref);@@ -2291,9 +2298,7 @@ void i915_ppgtt_release(struct kref *kref)WARN_ON (!list_empty (&ppgtt->base.inactive_list));WARN_ON (!list_empty (&ppgtt->base.unbound_list)); -i915_gem_timeline_fini (&ppgtt->base.timeline); -list_del (&ppgtt->base.global_link); -drm_mm_takedown (&ppgtt->base.mm); +i915_address_space_fini (&ppgtt->base); ppgtt->base.cleanup (&ppgtt->base);kfree (ppgtt);
drivers/gpu/drm/i915/i915_gem_gtt.c void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv) · line 2842
Quoted 7 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-3@@ -2834,9 +2839,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)if (drm_mm_initialized (&ggtt->base.mm)) {intel_vgt_deballoon (dev_priv); - -drm_mm_takedown (&ggtt->base.mm); -list_del (&ggtt->base.global_link); +i915_address_space_fini (&ggtt->base);
As you've probably realised, I asserted that the timeline was removed under the struct mutex.
-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
PATCH 1/1 drm/i915: add i915_address_space_fini
In reply to Matthew AuldWe already have an i915_address_space_init, so for symmetry we should also have a _fini, plus we already open code it twice. This then also fixes a bug where we leak the timeline for the ggtt vm.
v2: don't forget about the struct_mutex for the ggtt path.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +12 -6
@@ -2193,6 +2193,13 @@ static void i915_address_space_init(struct i915_address_space *vm,list_add_tail (&vm->global_link, &dev_priv->vm_list); } +static void i915_address_space_fini (struct i915_address_space *vm) +{ +i915_gem_timeline_fini (&vm->timeline); +drm_mm_takedown (&vm->mm); +list_del (&vm->global_link); +} +static void gtt_write_workarounds (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -2279,7 +2286,7 @@ i915_ppgtt_create(struct drm_i915_private *dev_priv,return ppgtt; } -void i915_ppgtt_release (struct kref *kref) +void i915_ppgtt_release (struct kref *kref) {struct i915_hw_ppgtt *ppgtt = container_of(kref, struct i915_hw_ppgtt, ref);
@@ -2291,9 +2298,7 @@ void i915_ppgtt_release(struct kref *kref)WARN_ON (!list_empty (&ppgtt->base.inactive_list));WARN_ON (!list_empty (&ppgtt->base.unbound_list)); -i915_gem_timeline_fini (&ppgtt->base.timeline); -list_del (&ppgtt->base.global_link); -drm_mm_takedown (&ppgtt->base.mm); +i915_address_space_fini (&ppgtt->base); ppgtt->base.cleanup (&ppgtt->base);kfree (ppgtt);
@@ -2835,8 +2840,9 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)if (drm_mm_initialized (&ggtt->base.mm)) {intel_vgt_deballoon (dev_priv); -drm_mm_takedown (&ggtt->base.mm); -list_del (&ggtt->base.global_link); +mutex_lock (&dev_priv->drm.struct_mutex); +i915_address_space_fini (&ggtt->base); +mutex_unlock (&dev_priv->drm.struct_mutex); } ggtt->base.cleanup (&ggtt->base);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Matthew Auld
We already have an
i915_address_space_init, so for symmetry we should also have a_fini, plus we already open code it twice. This then also fixes a bug where we leak the timeline for the ggtt vm.v2: don't forget about the
struct_mutexfor the ggtt path.Fixes 80b204bce8f2 ("drm/i915: Enable multiple timelines")Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>
drivers/gpu/drm/i915/i915_gem_gtt.c i915_ppgtt_create(struct drm_i915_private *dev_priv, · line 2289
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -2279,7 +2286,7 @@ i915_ppgtt_create(struct drm_i915_private *dev_priv,return ppgtt; } -void i915_ppgtt_release (struct kref *kref) +void i915_ppgtt_release (struct kref *kref)
Finally!
I'm sure the rest of the patch is just as good ;)
-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