From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Alex Goins <agoins@nvidia.com>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH i915 v5 2/2] i915: wait for fence in prepare_plane_fb
Date: Mon, 23 Nov 2015 09:44:22 +0100 [thread overview]
Message-ID: <5652D1E6.4020205@linux.intel.com> (raw)
In-Reply-To: <fe54deb449515a0d7dfa428f98e87a8780345832.1448057111.git.agoins@nvidia.com>
Op 20-11-15 om 23:09 schreef Alex Goins:
> In intel_prepare_plane_fb, if fb is backed by dma-buf, wait for exclusive
> fence
>
> v2: First commit
> v3: Remove object_name_lock acquire
> Move wait from intel_atomic_commit() to intel_prepare_plane_fb()
> v4: Wait only on exclusive fences, interruptible with no timeout
> v5: Style tweaks to more closely match rest of file
>
> Signed-off-by: Alex Goins <agoins@nvidia.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index eef3475..f5ab8a7 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13347,6 +13347,12 @@ intel_prepare_plane_fb(struct drm_plane *plane,
> if (!obj)
> return 0;
>
> + /* For framebuffer backed by dmabuf, wait for fence */
> + if (obj->base.dma_buf)
> + reservation_object_wait_timeout_rcu(obj->base.dma_buf->resv,
> + false, true,
> + MAX_SCHEDULE_TIMEOUT);
>
This is missing -ERESTARTSYS handling for interruptible waits here.
Full error handling could be fun with radeon fences, which may return -EDEADLK. Maybe it's best to only warn if an error other than -ERESTARTSYS is returned, and continue.
There's not much recovery we can do if someone else's fence returns an error.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2015-11-23 8:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 22:09 [PATCH i915 v5 0/2] PRIME Synchronization Alex Goins
2015-11-20 22:09 ` [PATCH i915 v5 1/2] i915: wait for fence in mmio_flip_work_func Alex Goins
2015-11-20 22:09 ` [PATCH i915 v5 2/2] i915: wait for fence in prepare_plane_fb Alex Goins
2015-11-23 8:44 ` Maarten Lankhorst [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=5652D1E6.4020205@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=agoins@nvidia.com \
--cc=dri-devel@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