* [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset
@ 2016-11-28 10:36 Matthew Auld
2016-11-28 10:59 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-11-28 11:21 ` [PATCH] " Joonas Lahtinen
0 siblings, 2 replies; 6+ messages in thread
From: Matthew Auld @ 2016-11-28 10:36 UTC (permalink / raw)
To: intel-gfx
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.
Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5d11002319f7..772a72a21513 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: drop the struct_mutex when wedged or trying to reset
2016-11-28 10:36 [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset Matthew Auld
@ 2016-11-28 10:59 ` Patchwork
2016-11-28 11:21 ` [PATCH] " Joonas Lahtinen
1 sibling, 0 replies; 6+ messages in thread
From: Patchwork @ 2016-11-28 10:59 UTC (permalink / raw)
To: Matthew Auld; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset
2016-11-28 10:36 [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset Matthew Auld
2016-11-28 10:59 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2016-11-28 11:21 ` Joonas Lahtinen
2016-11-28 11:40 ` Jani Nikula
1 sibling, 1 reply; 6+ messages in thread
From: Joonas Lahtinen @ 2016-11-28 11:21 UTC (permalink / raw)
To: Matthew Auld, intel-gfx; +Cc: Daniel Vetter
On ma, 2016-11-28 at 10:36 +0000, Matthew Auld wrote:
> 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.
>
> Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: stable # v4.6 ?
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset
2016-11-28 11:21 ` [PATCH] " Joonas Lahtinen
@ 2016-11-28 11:40 ` Jani Nikula
2016-11-28 12:10 ` Joonas Lahtinen
2016-11-29 9:26 ` Chris Wilson
0 siblings, 2 replies; 6+ messages in thread
From: Jani Nikula @ 2016-11-28 11:40 UTC (permalink / raw)
To: Joonas Lahtinen, Matthew Auld, intel-gfx; +Cc: Daniel Vetter
On Mon, 28 Nov 2016, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
> On ma, 2016-11-28 at 10:36 +0000, Matthew Auld wrote:
>> 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.
>>
>> Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
>
> Cc: stable # v4.6 ?
$ dim fixes 7f1847ebf48b
Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.7+
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>
> Regards, Joonas
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset
2016-11-28 11:40 ` Jani Nikula
@ 2016-11-28 12:10 ` Joonas Lahtinen
2016-11-29 9:26 ` Chris Wilson
1 sibling, 0 replies; 6+ messages in thread
From: Joonas Lahtinen @ 2016-11-28 12:10 UTC (permalink / raw)
To: Jani Nikula, Matthew Auld, intel-gfx; +Cc: Daniel Vetter
On ma, 2016-11-28 at 13:40 +0200, Jani Nikula wrote:
> > On Mon, 28 Nov 2016, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
> >
> > Cc: stable # v4.6 ?
>
> $ dim fixes 7f1847ebf48b
> Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: <stable@vger.kernel.org> # 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
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset
2016-11-28 11:40 ` Jani Nikula
2016-11-28 12:10 ` Joonas Lahtinen
@ 2016-11-29 9:26 ` Chris Wilson
1 sibling, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2016-11-29 9:26 UTC (permalink / raw)
To: Jani Nikula; +Cc: Daniel Vetter, intel-gfx, Matthew Auld
On Mon, Nov 28, 2016 at 01:40:17PM +0200, Jani Nikula wrote:
> On Mon, 28 Nov 2016, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
> > On ma, 2016-11-28 at 10:36 +0000, Matthew Auld wrote:
> >> 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.
> >>
> >> Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
> >> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> >> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> >
> > Cc: stable # v4.6 ?
>
> $ dim fixes 7f1847ebf48b
> Fixes: 7f1847ebf48b ("drm/i915: Simplify checking of GPU reset_counter in display pageflips")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Cc: <stable@vger.kernel.org> # v4.7+
Pushed with the stable tag appended. Thanks,
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-29 9:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-28 10:36 [PATCH] drm/i915: drop the struct_mutex when wedged or trying to reset Matthew Auld
2016-11-28 10:59 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-11-28 11:21 ` [PATCH] " Joonas Lahtinen
2016-11-28 11:40 ` Jani Nikula
2016-11-28 12:10 ` Joonas Lahtinen
2016-11-29 9:26 ` Chris Wilson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox