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

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

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index d1cbb9c8f806761d9c0879e8a13bf0ad57c2f6ad..3bdd314f02b1eadff94f604b8efdbd4e2abe2cde 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -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,
                              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
         * cases we check here are terminal states. For those the barriers
         * provided by the wake_up/wait_event pair are enough.
         */
-       ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
-              txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
-       return ret;
+       state = READ_ONCE(txmsg->state);
+       return (state == DRM_DP_SIDEBAND_TX_RX ||
+               state == DRM_DP_SIDEBAND_TX_TIMEOUT);
 }
 
 static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,