From: Daniel Vetter <daniel@ffwll.ch>
To: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 08/11] Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES"
Date: Wed, 28 Jan 2015 10:53:10 +0100 [thread overview]
Message-ID: <20150128095310.GT4764@phenom.ffwll.local> (raw)
In-Reply-To: <1422276205-8532-9-git-send-email-rodrigo.vivi@intel.com>
On Mon, Jan 26, 2015 at 04:43:22AM -0800, Rodrigo Vivi wrote:
> From: Chris Wilson <chris@chris-wilson.co.uk>
>
> The core fix was applied in
>
> commit a63b03e2d2477586440741677ecac45bcf28d7b1
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Tue Jan 6 10:29:35 2015 +0000
>
> mutex: Always clear owner field upon mutex_unlock()
>
> (note the absence of stable@ tag)
>
> so we can now revert our band-aid commit 226e5ae9e5f910 for -next.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_gem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 0a074bc..b50a2b4 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -5213,7 +5213,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
> if (!mutex_is_locked(mutex))
> return false;
>
> -#if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES)
> +#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
> return mutex->owner == task;
> #else
> /* Since UP may be pre-empted, we cannot assume that we own the lock */
> --
> 1.9.3
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-01-28 9:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-26 12:43 [PATCH 00/11] drm-intel-collector - update Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 01/11] drm/i915: Put logical pipe_control emission into a helper Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 02/11] drm/i915: Add WaCsStallBeforeStateCacheInvalidate:bdw, chv to logical ring Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 03/11] drm/i915: Remove pinned check from madvise_ioctl Rodrigo Vivi
2015-01-28 9:52 ` Daniel Vetter
2015-01-26 12:43 ` [PATCH 04/11] drm/i915: Extend GET_APERTURE ioctl to report available map space Rodrigo Vivi
2015-01-28 9:59 ` Daniel Vetter
2015-04-29 10:24 ` Chris Wilson
2015-04-29 10:27 ` Chris Wilson
2015-04-30 10:17 ` Joonas Lahtinen
2015-01-26 12:43 ` [PATCH 05/11] drm/i915: Display current hangcheck status in debugfs Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 06/11] drm/i915/vlv: check port in infoframe_enabled v2 Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 07/11] drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 08/11] Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES" Rodrigo Vivi
2015-01-28 9:53 ` Daniel Vetter [this message]
2015-01-26 12:43 ` [PATCH 09/11] drm/i915: FIFO space query code refactor Rodrigo Vivi
2015-01-26 12:43 ` [PATCH 10/11] drm/i915: add irq_barrier operation for synchronising reads Rodrigo Vivi
2015-01-28 9:55 ` Daniel Vetter
2015-01-28 10:02 ` Chris Wilson
2015-01-26 12:43 ` [PATCH 11/11] drm/i915: use effective_size for ringbuffer calculations Rodrigo Vivi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150128095310.GT4764@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox