drm/i915/guc: Add uc_fini_wq in gem_init unwind path
Subsystems (2)
PATCH 1/1 drm/i915/guc: Add uc_fini_wq in gem_init unwind path
While moving code around for solving lockdep issue for GuC log relay, spotted that uc_fini_wq is not being called in failure path in gem_init. Missed in the below commit. Add it.
--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -5283,6 +5283,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev_priv->drm.struct_mutex); +intel_uc_fini_wq (dev_priv); +if (ret != -EIO )i915_gem_cleanup_userptr (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/1] drm/i915/guc: Add uc_fini_wq in gem_init unwind path
== Series Details ==
== Series Details ==
Series: series starting with [1/1] drm/i915/guc: Add uc_fini_wq in gem_init unwind path
URL : https://patchwork.freedesktop.org/series/36253/
State : success
== Summary ==
Series 36253v1 series starting with [1/1] drm/i915/guc: Add uc_fini_wq in gem_init unwind path
https://patchwork.freedesktop.org/api/1.0/series/36253/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-fail -> FAIL (fi-elk-e7500) fdo#103989 +1
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
fail -> PASS (fi-skl-6700k2) fdo#104108fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:422s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:425s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:372s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:485s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:279s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:485s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:489s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:478s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:456s fi-elk-e7500 total:224 pass:167 dwarn:10 dfail:0 fail:1 skip:45 fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:280s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:511s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:393s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:403s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:456s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:413s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:468s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:498s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:503s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:572s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:424s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:505s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:526s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:492s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:490s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:431s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:529s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:402s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:579s fi-cnl-y2 total:288 pass:258 dwarn:3 dfail:0 fail:0 skip:27 time:553s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:469s
c6410238e3c4f1282ef9709b65f553a555cf43eb drm-tip: 2018y-01m-09d-18h-59m-27s UTC integration manifest 8c6d2bf445d8 drm/i915/guc: Add uc_fini_wq in gem_init unwind path
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7638/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for series starting with [1/1] drm/i915/guc: Add uc_fini_wq in gem_init unwind path
In reply to Sagar Arun Kamble== Series Details ==
== Series Details ==
Series: series starting with [1/1] drm/i915/guc: Add uc_fini_wq in gem_init unwind path
URL : https://patchwork.freedesktop.org/series/36253/
State : warning
== Summary ==
Test kms_flip:
Subgroup flip-vs-absolute-wf_vblank-interruptible:
fail -> PASS (shard-hsw) fdo#100368
Subgroup flip-vs-dpms-off-vs-modeset-interruptible:
pass -> DMESG-WARN (shard-hsw)
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623 +1fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2576 pass:1462 dwarn:2 dfail:0 fail:9 skip:1101 time:8295s shard-snb total:2576 pass:1246 dwarn:1 dfail:0 fail:9 skip:1318 time:7203s Blacklisted hosts: shard-apl total:2576 pass:1597 dwarn:1 dfail:0 fail:26 skip:950 time:12467s shard-kbl total:2576 pass:1712 dwarn:1 dfail:0 fail:25 skip:836 time:9525s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7638/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Sagar Arun Kamble
While moving code around for solving lockdep issue for GuC log relay, spotted that
uc_fini_wqis not being called in failure path ingem_init. Missed in the below commit. Add it.Signed-off-by Sagar Arun Kamble <[email protected]>Fixes 3176ff49bc3e ("drm/i915/guc: Move GuC workqueue allocations outside of the mutex")Cc Michał Winiarski <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_gem.c +0
-0
drivers/gpu/drm/i915/i915_gem.c int i915_gem_init(struct drm_i915_private *dev_priv) · line 5287
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c +2
-0@@ -5283,6 +5283,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev_priv->drm.struct_mutex); +intel_uc_fini_wq (dev_priv); +
Ooppss.
Now that we're doing proper cleanup here, we also need to remove:
GEM_BUG_ON(!HAS_GUC(dev_priv));
from intel_uc_fini_wq - otherwise we'll hit it with enable_guc=1 on plaforms without GuC.
With that:
-Michał
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0if (ret != -EIO )i915_gem_cleanup_userptr (dev_priv);Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · Michał Winiarski
Quoted 17 lines · Sagar Arun Kamble
While moving code around for solving lockdep issue for GuC log relay, spotted that
uc_fini_wqis not being called in failure path ingem_init. Missed in the below commit. Add it.Signed-off-by Sagar Arun Kamble <[email protected]>Fixes 3176ff49bc3e ("drm/i915/guc: Move GuC workqueue allocations outside of the mutex")Cc Michał Winiarski <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_gem.c +0
-0drivers/gpu/drm/i915/i915_gem.c int i915_gem_init(struct drm_i915_private *dev_priv) · line 5287
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c +2
-0@@ -5283,6 +5283,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev_priv->drm.struct_mutex); +intel_uc_fini_wq (dev_priv); +Ooppss.
Quoted 6 lines
Now that we're doing proper cleanup here, we also need to remove:
GEM_BUG_ON(!HAS_GUC(dev_priv));
from
intel_uc_fini_wq- otherwise we'll hit it with enable_guc=1 on plaforms without GuC.
Took some time for me to understand why we will not hit this on other uc_fini paths :) Thanks for the review.
Quoted 12 lines
With that:
Reviewed-by Michał Winiarski <[email protected]>-Michał
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0if (ret != -EIO )i915_gem_cleanup_userptr (dev_priv);Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx