From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: daniel.vetter@ffwll.ch, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org
Subject: Re: [PATCH 1/3] drm/nouveau: wait for moving fence after pinning
Date: Mon, 21 Jun 2021 17:49:37 +0200 [thread overview]
Message-ID: <2033755d-c49f-8b90-f726-d640146a3df7@gmail.com> (raw)
In-Reply-To: <YNCoK1qv6CCIy0Rl@phenom.ffwll.local>
Am 21.06.21 um 16:54 schrieb Daniel Vetter:
> On Mon, Jun 21, 2021 at 03:03:26PM +0200, Christian König wrote:
>> We actually need to wait for the moving fence after pinning
>> the BO to make sure that the pin is completed.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
>> CC: stable@kernel.org
>> ---
>> drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
>> index 347488685f74..591738545eba 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_prime.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
>> @@ -93,7 +93,13 @@ int nouveau_gem_prime_pin(struct drm_gem_object *obj)
>> if (ret)
>> return -EINVAL;
>>
>> - return 0;
>> + if (nvbo->bo.moving) {
> Don't we need to hold the dma_resv to read this? We can grab a reference
> and then unlock, but I think just unlocked wait can go boom pretty easily
> (since we don't hold a reference or lock so someone else can jump in and
> free the moving fence).
The moving fence is only modified while the BO is moved and since we
have just successfully pinned it....
But in general I agree that it would be better to avoid this. I just
didn't wanted to open a bigger can of worms by changing nouveau so much.
Christian.
> -Daniel
>
>> + ret = dma_fence_wait(nvbo->bo.moving, true);
>> + if (ret)
>> + nouveau_bo_unpin(nvbo);
>> + }
>> +
>> + return ret;
>> }
>>
>> void nouveau_gem_prime_unpin(struct drm_gem_object *obj)
>> --
>> 2.25.1
>>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-06-21 15:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 13:03 [PATCH 1/3] drm/nouveau: wait for moving fence after pinning Christian König
2021-06-21 13:03 ` [PATCH 2/3] drm/radeon: " Christian König
2021-06-21 14:55 ` Daniel Vetter
2021-06-21 13:03 ` [PATCH 3/3] drm/amdgpu: " Christian König
2021-06-21 14:56 ` Daniel Vetter
2021-06-21 14:54 ` [PATCH 1/3] drm/nouveau: " Daniel Vetter
2021-06-21 15:49 ` Christian König [this message]
2021-06-21 15:53 ` Daniel Vetter
2021-06-22 9:20 ` Daniel Vetter
2021-06-22 9:29 ` 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=2033755d-c49f-8b90-f726-d640146a3df7@gmail.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=nouveau@lists.freedesktop.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