mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Gustavo Padovan <gustavo@padovan.org>, dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org,
	Daniel Stone <daniels@collabora.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Rob Clark <robdclark@gmail.com>,
	Greg Hackmann <ghackmann@google.com>,
	John Harrison <John.C.Harrison@Intel.com>,
	laurent.pinchart@ideasonboard.com, seanpaul@google.com,
	marcheu@google.com, m.chehab@samsung.com,
	Sumit Semwal <sumit.semwal@linaro.org>,
	Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
	Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH v2 2/2] drm/fence: allow fence waiting to be interrupted by userspace
Date: Thu, 18 Aug 2016 10:28:06 +0200	[thread overview]
Message-ID: <cb572389-f1ae-65a7-7dd3-f314d7a9f744@linux.intel.com> (raw)
In-Reply-To: <1471302341-12824-2-git-send-email-gustavo@padovan.org>

Op 16-08-16 om 01:05 schreef Gustavo Padovan:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> If userspace is running an synchronously atomic commit and interrupts the
> atomic operation during fence_wait() it will hang until the timer expires,
> so here we change the wait to be interruptible so it stop immediately when
> userspace wants to quit.
>
> Also adds the necessary error checking for fence_wait().
>
> v2: Comment by Daniel Vetter
> 	- Add error checking for fence_wait()
>
> v3: Rebase on top of new atomic noblocking support
>
> v4: Comment by Maarten Lankhorst
> 	- remove 'swapped' bitfield as it was duplicating information
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
I think it would make sense to squash this patch with 1/2.
> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 33 ++++++++++++++++++++++++++++-----
>  1 file changed, 28 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index bf1bc43..292d15b 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1022,20 +1022,37 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev,
>  {
>  	struct drm_plane *plane;
>  	struct drm_plane_state *plane_state;
> +	struct fence *fence;
>  	int i, ret;
>  
>  	for_each_plane_in_state(state, plane, plane_state, i) {
> -		if (!plane->state->fence)
> +		if (!plane->state->fence && !plane_state->fence)
>  			continue;
Move this check to below, or put if (!intr) plane_state = plane->state on top, and only use plane_state.

Daniel, I keep thinking more and more that a for_each_XXX_(old,new,both)_state would be useful,
could we add those perhaps?
> -		WARN_ON(!plane->state->fb);
> +		/*
> +		 * If the caller asks for an interruptible wait it means
> +		 * that the state were not swapped yet and the operation
> +		 * can still be interrupted by userspace, so we need
> +		 * to look to plane_state instead.
> +		 */
> +		if (intr) {
> +			fence = plane_state->fence;
> +			WARN_ON(!plane_state->fb);
> +		} else {
> +			fence = plane->state->fence;
> +			WARN_ON(!plane->state->fb);
> +		}
^ if (!fence) continue;
> -		ret = fence_wait(plane->state->fence, intr);
> +		ret = fence_wait(fence, intr);
>  		if (ret)
>  			return ret;
>  
> -		fence_put(plane->state->fence);
> -		plane->state->fence = NULL;
> +		fence_put(fence);
> +
> +		if (intr)
> +			plane_state->fence = NULL;
> +		else
> +			plane->state->fence = NULL;
>  	}
>  
>  	return 0;
> @@ -1244,6 +1261,12 @@ int drm_atomic_helper_commit(struct drm_device *dev,
>  	if (ret)
>  		return ret;
>  
> +	if (!nonblock) {
> +		ret = drm_atomic_helper_wait_for_fences(dev, state, true);
> +		if (ret)
> +			return ret;
> +	}
> +
>  	/*
>  	 * This is the point of no return - everything below never fails except
>  	 * when the hw goes bonghits. Which means we can commit the new state on

      reply	other threads:[~2016-08-18  8:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-15 23:05 [PATCH v2 1/2] drm/fence: enable drm_atomic_helper_wait_for_fences() to interrupt Gustavo Padovan
2016-08-15 23:05 ` [PATCH v2 2/2] drm/fence: allow fence waiting to be interrupted by userspace Gustavo Padovan
2016-08-18  8:28   ` 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=cb572389-f1ae-65a7-7dd3-f314d7a9f744@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=John.C.Harrison@Intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel@ffwll.ch \
    --cc=daniels@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=ghackmann@google.com \
    --cc=gustavo.padovan@collabora.co.uk \
    --cc=gustavo@padovan.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    --cc=marcheu@google.com \
    --cc=robdclark@gmail.com \
    --cc=seanpaul@google.com \
    --cc=sumit.semwal@linaro.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®