All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/dp: Wait up all outstanding tx waiters
Date: Mon, 15 May 2017 14:04:43 +0200	[thread overview]
Message-ID: <20170515120443.al2p6dhpegpqqeti@phenom.ffwll.local> (raw)
In-Reply-To: <20170513105201.17658-2-chris@chris-wilson.co.uk>

On Sat, May 13, 2017 at 11:52:01AM +0100, Chris Wilson wrote:
> As we can have multiple tx in the queue, with individual waiters, make
> sure that all are woken when any state changes (so that we are sure the
> right owner of the txmsg is woken).
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

I think in practice we need probe vs. the userspace dp aux interface (or
multiple userspace apps beating on this), and on multiple different mst
sinks, but better safe than sorry.

Applied, thanks.
-Daniel
> ---
>  drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 3bdd314f02b1..222eb1a8549b 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -855,7 +855,7 @@ static void drm_dp_destroy_mst_branch_device(struct kref *kref)
>  	mutex_unlock(&mstb->mgr->qlock);
>  
>  	if (wake_tx)
> -		wake_up(&mstb->mgr->tx_waitq);
> +		wake_up_all(&mstb->mgr->tx_waitq);
>  
>  	kref_put(kref, drm_dp_free_mst_branch_device);
>  }
> @@ -1510,7 +1510,7 @@ static void process_single_down_tx_qlock(struct drm_dp_mst_topology_mgr *mgr)
>  		if (txmsg->seqno != -1)
>  			txmsg->dst->tx_slots[txmsg->seqno] = NULL;
>  		txmsg->state = DRM_DP_SIDEBAND_TX_TIMEOUT;
> -		wake_up(&mgr->tx_waitq);
> +		wake_up_all(&mgr->tx_waitq);
>  	}
>  }
>  
> @@ -2258,7 +2258,7 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
>  		mstb->tx_slots[slot] = NULL;
>  		mutex_unlock(&mgr->qlock);
>  
> -		wake_up(&mgr->tx_waitq);
> +		wake_up_all(&mgr->tx_waitq);
>  	}
>  	return ret;
>  }
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-05-15 12:04 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-13 10:52 [PATCH 1/2] drm/dp: Read the tx msg state once after checking for an event Chris Wilson
2017-05-13 10:52 ` [PATCH 2/2] drm/dp: Wait up all outstanding tx waiters Chris Wilson
2017-05-13 11:06   ` Chris Wilson
2017-05-15 12:04   ` Daniel Vetter [this message]
2017-05-15 12:33     ` [Intel-gfx] " Ville Syrjälä
2017-05-15 13:37       ` Daniel Vetter
2017-05-15 15:02         ` [Intel-gfx] " Jani Nikula
2017-05-13 11:18 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/dp: Read the tx msg state once after checking for an event Patchwork
2017-05-15 12:02 ` [PATCH 1/2] " Daniel Vetter

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=20170515120443.al2p6dhpegpqqeti@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=chris@chris-wilson.co.uk \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.