redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/dp: Read the tx msg state once after checking for an event

Browse source 
Both as an exercise to document that we are reading the state outside of
the appropriate mutex and to ensure that we only read the value once
before the multiple comparisons, use READ_ONCE.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170513105201.17658-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2017-05-13 11:52:00 +01:00 committed by Daniel Vetter
parent bebc1d55d2
commit 992d38cc78
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpu/drm/drm_dp_mst_topology.c
View file

@ -737,16 +737,16 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr,
static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr, static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg) struct drm_dp_sideband_msg_tx *txmsg)
{ {
bool ret; unsigned int state;
/* /*
* All updates to txmsg->state are protected by mgr->qlock, and the two * All updates to txmsg->state are protected by mgr->qlock, and the two
* cases we check here are terminal states. For those the barriers * cases we check here are terminal states. For those the barriers
* provided by the wake_up/wait_event pair are enough. * provided by the wake_up/wait_event pair are enough.
*/ */
ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX || state = READ_ONCE(txmsg->state);
txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT); return (state == DRM_DP_SIDEBAND_TX_RX ||
return ret; state == DRM_DP_SIDEBAND_TX_TIMEOUT);
} }
static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,