mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] drm/amdgpu: use new ww_mutex_is_owned_by function
Date: Tue, 20 Feb 2018 13:58:27 +0100	[thread overview]
Message-ID: <20180220125829.27060-2-christian.koenig@amd.com> (raw)
In-Reply-To: <20180220125829.27060-1-christian.koenig@amd.com>

Instead of accessing ww_mutex internals directly use the provided
function to check if the ww_mutex was indeed locked by the current
command submission.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index eaa3cb0c3ad1..6db26a3144dc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1594,7 +1594,7 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
 	*map = mapping;
 
 	/* Double check that the BO is reserved by this CS */
-	if (READ_ONCE((*bo)->tbo.resv->lock.ctx) != &parser->ticket)
+	if (!ww_mutex_is_owned_by(&(*bo)->tbo.resv->lock, &parser->ticket))
 		return -EINVAL;
 
 	if (!((*bo)->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)) {
-- 
2.14.1

  reply	other threads:[~2018-02-20 12:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-20 12:58 [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function v3 Christian König
2018-02-20 12:58 ` Christian König [this message]
2018-02-23  9:48   ` [PATCH 2/4] drm/amdgpu: use new ww_mutex_is_owned_by function He, Roger
2018-02-20 12:58 ` [PATCH 3/4] drm/ttm: handle already locked BOs during eviction and swapout Christian König
2018-02-23  9:46   ` He, Roger
2018-02-23 12:05     ` Christian König
2018-02-24  3:36       ` He, Roger
2018-02-24  3:46         ` He, Roger
2018-02-20 12:58 ` [PATCH 4/4] drm/ttm: keep BOs reserved until end of eviction Christian König
2018-02-23  9:29   ` He, Roger
2018-02-20 13:12 ` [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function v3 Peter Zijlstra
2018-02-20 13:26   ` Christian König
2018-02-20 13:57     ` Peter Zijlstra
2018-02-20 14:34       ` Christian König
2018-02-20 14:54         ` Peter Zijlstra
2018-02-20 15:05           ` Christian König
2018-02-20 15:21             ` Peter Zijlstra
2018-02-20 23:56               ` Daniel Vetter
2018-02-21 10:54                 ` Maarten Lankhorst
2018-02-21 11:50                   ` Christian König
2018-02-21 21:10   ` Emil Velikov
2018-02-20 14:02 ` Daniel Vetter
  -- strict thread matches above, loose matches on Subject: below --
2018-02-19  9:56 [PATCH 1/4] locking/ww_mutex: add ww_mutex_is_owned_by function Christian König
2018-02-19  9:56 ` [PATCH 2/4] drm/amdgpu: use new " Christian König

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=20180220125829.27060-2-christian.koenig@amd.com \
    --to=ckoenig.leichtzumerken@gmail.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®