dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.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-5C7GfCeVMHo@public.gmane.org>

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

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2018-02-20 12:58 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
     [not found] ` <20180220125829.27060-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-02-20 12:58   ` Christian König [this message]
     [not found]     ` <20180220125829.27060-2-christian.koenig-5C7GfCeVMHo@public.gmane.org>
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
     [not found]     ` <20180220125829.27060-3-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-02-23  9:46       ` He, Roger
2018-02-23 12:05         ` Christian König
     [not found]           ` <6eadbbea-8eca-a1ab-93bb-d37ae6e5f29d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-02-24  3:36             ` He, Roger
     [not found]               ` <MWHPR1201MB01278E573419210283D68640FDC30-3iK1xFAIwjq9imrIu4W8xGrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
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
     [not found]     ` <20180220125829.27060-4-christian.koenig-5C7GfCeVMHo@public.gmane.org>
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
     [not found]   ` <20180220131253.GF25314-Nxj+rRp3nVydTX5a5knrm8zTDFooKrT+cvkQGrU6aU0@public.gmane.org>
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
     [not found]                   ` <20180220235621.GD22199-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org>
2018-02-21 10:54                     ` Maarten Lankhorst
     [not found]                       ` <9d782099-567f-38cb-391a-3c2a50cd5edd-FcfepWsj2zOByvU0x3ry2g@public.gmane.org>
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
     [not found] ` <20180219095610.2747-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
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-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.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