Skip to contentSkip to conversation

drm/msm/a5xx: Fix barrier usage in set_preempt_state()

PATCH In review Davidlohr Bueso 1 participant 2 messages Oct 15, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm/a5xx: Fix barrier usage in set_preempt_state()

Because it is not a Rmw operation, atomic_set() is never serialized, and therefore the 'upgradable' smp_mb__{before,after}_atomic() calls that order the write to preempt_state are completely bogus.

This patch replaces these with smp_mb(), which seems like the original intent of when the code was written.

---
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +2 -2
index 9cf9353a7ff1..d27d8d3208c6 100644
@@ -30,10 +30,10 @@ static inline void set_preempt_state(struct a5xx_gpu *gpu,
 	 * preemption or in the interrupt handler so barriers are needed
 	 * before...
 	 */
-	smp_mb__before_atomic();
+	smp_mb();
 	atomic_set(&gpu->preempt_state, new);
 	/* ... and after*/
-	smp_mb__after_atomic();
+	smp_mb();
 }
 
 /* Write the most recent wptr for the given ring into the hardware */
Signature · 6 lines
2.16.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

Forgot to Cc lkml.

Quoted 32 lines · Davidlohr Bueso

Because it is not a Rmw operation, atomic_set() is never serialized, and therefore the 'upgradable' smp_mb__{before,after}_atomic() calls that order the write to preempt_state are completely bogus.

This patch replaces these with smp_mb(), which seems like the original intent of when the code was written.

---
drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +2 -2
index 9cf9353a7ff1..d27d8d3208c6 100644
@@ -30,10 +30,10 @@ static inline void set_preempt_state(struct a5xx_gpu *gpu,
 	 * preemption or in the interrupt handler so barriers are needed
 	 * before...
 	 */
-	smp_mb__before_atomic();
+	smp_mb();
 	atomic_set(&gpu->preempt_state, new);
 	/* ... and after*/
-	smp_mb__after_atomic();
+	smp_mb();
 }
 
 /* Write the most recent wptr for the given ring into the hardware */
Signature · 1 line
2.16.4