drm/i915: drop the struct_mutex when wedged or trying to reset
Subsystems (2)
PATCH 1/1 drm/i915: drop the struct_mutex when wedged or trying to reset
We grab the struct_mutex in intel_crtc_page_flip, but if we are wedged or a reset is in progress we bail early but never seem to actually release the lock.
--- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +2 -1
@@ -12214,7 +12214,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, intel_crtc->reset_count =i915_reset_count (&dev_priv->gpu_error);if (i915_reset_in_progress_or_wedged (&dev_priv->gpu_error)) { ret = -EIO ; - goto cleanup; + goto unlock; }atomic_inc (&intel_crtc->unpin_work_count);
@@ -12302,6 +12302,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,intel_unpin_fb_obj (fb, crtc->primary->state->rotation); cleanup_pending:atomic_dec (&intel_crtc->unpin_work_count); +unlock:mutex_unlock (&dev->struct_mutex); cleanup: crtc->primary->fb = old_fb;
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: drop the struct_mutex when wedged or trying to reset
== Series Details ==
== Series Details ==
Series: drm/i915: drop the struct_mutex when wedged or trying to reset
URL : https://patchwork.freedesktop.org/series/16024/
State : success
== Summary ==
Series 16024v1 drm/i915: drop the struct_mutex when wedged or trying to reset
https://patchwork.freedesktop.org/api/1.0/series/16024/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-a:
dmesg-warn -> PASS (fi-ilk-650)fi-bdw-5557u total:245 pass:230 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:245 pass:205 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:245 pass:217 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:245 pass:225 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:245 pass:192 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:245 pass:223 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:245 pass:224 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:245 pass:223 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:245 pass:231 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:245 pass:213 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:245 pass:212 dwarn:0 dfail:0 fail:0 skip:33
4d904cb07bb992d4b5f3c8b8d00ed5297b774c0c drm-tip: 2016y-11m-28d-08h-24m-29s UTC integration manifest f17af58 drm/i915: drop the struct_mutex when wedged or trying to reset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3121/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Matthew Auld
We grab the
struct_mutexinintel_crtc_page_flip, but if we are wedged or a reset is in progress we bail early but never seem to actually release the lock.Fixes 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>
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
Jani Nikula
maintainerQuoted 10 lines · Joonas Lahtinen
Quoted 7 lines · Matthew Auld
We grab the
struct_mutexinintel_crtc_page_flip, but if we are wedged or a reset is in progress we bail early but never seem to actually release the lock.Fixes 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc stable # v4.6 ?
$ dim fixes 7f1847ebf48b
Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
Cc: Chris Wilson <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: [email protected]
Cc: <[email protected]> # v4.7+Quoted 4 lines
Reviewed-by Joonas Lahtinen <[email protected]>Regards, Joonas
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoted 4 lines · Jani Nikula
Quoted 3 lines · Joonas Lahtinen
Cc stable # v4.6 ?
Quoted 9 lines
$ dim fixes 7f1847ebf48b
Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
Cc: Chris Wilson <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: [email protected]
Cc: <[email protected]> # v4.7+The last tag I have with the DIM setup after updating to drm-tip compliant structure is v4.6-rc1, maybe the Torvalds remote should be automated to make sure dim-fixes works (or at least warn if the oldest tag is too old?).
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
Quoted 12 lines · Jani Nikula
Quoted 10 lines · Joonas Lahtinen
Quoted 7 lines · Matthew Auld
We grab the
struct_mutexinintel_crtc_page_flip, but if we are wedged or a reset is in progress we bail early but never seem to actually release the lock.Fixes 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")Cc Chris Wilson <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc stable # v4.6 ?
Quoted 8 lines
$ dim fixes 7f1847ebf48b
Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
Cc: Chris Wilson <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: [email protected]
Cc: <[email protected]> # v4.7+Pushed with the stable tag appended. Thanks,
-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