From: Robert Foss <robert.foss@collabora.com>
To: Chris Wilson <chris@chris-wilson.co.uk>,
airlied@linux.ie, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org, robdclark@gmail.com
Subject: Re: [PATCH v1] drm/msm: Move fence put to where failure occurs
Date: Thu, 1 Nov 2018 18:08:11 +0100 [thread overview]
Message-ID: <8153c015-a082-1897-a486-6fe2c5166168@collabora.com> (raw)
In-Reply-To: <154108957570.30246.16686926988338640470@skylake-alporthouse-com>
Hey Chris,
On 2018-11-01 17:26, Chris Wilson wrote:
> Quoting Robert Foss (2018-11-01 16:12:28)
>> If dma_fence_wait fails to wait for a supplied in-fence in
>> msm_ioctl_gem_submit, make sure we release that in-fence.
>>
>> Also remove this dma_fence_put() from the 'out' label.
>>
>> Signed-off-by: Robert Foss <robert.foss@collabora.com>
>> ---
>> drivers/gpu/drm/msm/msm_gem_submit.c | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
>> index a90aedd6883a..3e7704af5b24 100644
>> --- a/drivers/gpu/drm/msm/msm_gem_submit.c
>> +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
>> @@ -411,7 +411,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
>> struct msm_file_private *ctx = file->driver_priv;
>> struct msm_gem_submit *submit;
>> struct msm_gpu *gpu = priv->gpu;
>> - struct dma_fence *in_fence = NULL;
>> struct sync_file *sync_file = NULL;
>> struct msm_gpu_submitqueue *queue;
>> struct msm_ringbuffer *ring;
>> @@ -444,7 +443,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
>> ring = gpu->rb[queue->prio];
>>
>> if (args->flags & MSM_SUBMIT_FENCE_FD_IN) {
>> - in_fence = sync_file_get_fence(args->fence_fd);
>> + struct dma_fence *in_fence = sync_file_get_fence(
>> + args->fence_fd);
>>
>> if (!in_fence)
>> return -EINVAL;
>> @@ -455,8 +455,10 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
>> */
>> if (!dma_fence_match_context(in_fence, ring->fctx->context)) {
>> ret = dma_fence_wait(in_fence, true);
>> - if (ret)
>> + if (ret) {
>> + dma_fence_put(in_fence);
>> return ret;
>> + }
>> }
>
> Careful, we need to keep the put for the normal path. Maybe,
Good catch, I'll send out a fixed version tomorrow.
>
> if (args->flags & MSM_SUBMIT_FENCE_FD_IN) {
> struct dma_fence *in_fence;
>
> in_fence = sync_file_get_fence(args->fence_fd); // keep line breaks natural
> if (!in_fence)
> return -EINVAL;
>
> ret = 0;
> if (!dma_fence_match_match_context(in_fence, ring->fctx->context)
> ret = dma_fence_wait(in_fence, true);
> dma_fence_put(in_fence);
> if (ret)
> return ret;
> }
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
prev parent reply other threads:[~2018-11-01 17:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-01 16:12 [PATCH v1] drm/msm: Move fence put to where failure occurs Robert Foss
2018-11-01 16:26 ` Chris Wilson
2018-11-01 17:08 ` Robert Foss [this message]
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=8153c015-a082-1897-a486-6fe2c5166168@collabora.com \
--to=robert.foss@collabora.com \
--cc=airlied@linux.ie \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.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;
as well as URLs for NNTP newsgroup(s).