File revert-smp_mb.diff of Package drm

4e857c58efeb99393cba5a5d0d8ec7117183137c

---
 drivers/gpu/drm/drm_irq.c       |   10 +++++-----
 drivers/gpu/drm/i915/i915_irq.c |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -128,7 +128,7 @@ static void vblank_disable_and_save(stru
 	 */
 	if ((vblrc > 0) && (abs64(diff_ns) > 1000000)) {
 		atomic_inc(&dev->vblank[crtc].count);
-		smp_mb__after_atomic();
+		smp_mb__after_atomic_inc();
 	}
 
 	/* Invalidate all timestamps while vblank irq's are off. */
@@ -858,9 +858,9 @@ static void drm_update_vblank_count(stru
 		vblanktimestamp(dev, crtc, tslot) = t_vblank;
 	}
 
-	smp_mb__before_atomic();
+	smp_mb__before_atomic_inc();
 	atomic_add(diff, &dev->vblank[crtc].count);
-	smp_mb__after_atomic();
+	smp_mb__after_atomic_inc();
 }
 
 /**
@@ -1469,9 +1469,9 @@ bool drm_handle_vblank(struct drm_device
 		/* Increment cooked vblank count. This also atomically commits
 		 * the timestamp computed above.
 		 */
-		smp_mb__before_atomic();
+		smp_mb__before_atomic_inc();
 		atomic_inc(&dev->vblank[crtc].count);
-		smp_mb__after_atomic();
+		smp_mb__after_atomic_inc();
 	} else {
 		DRM_DEBUG("crtc %d: Redundant vblirq ignored. diff_ns = %d\n",
 			  crtc, (int) diff_ns);
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2698,7 +2698,7 @@ static void i915_error_work_func(struct
 			 * updates before
 			 * the counter increment.
 			 */
-			smp_mb__before_atomic();
+			smp_mb__before_atomic_inc();
 			atomic_inc(&dev_priv->gpu_error.reset_counter);
 
 			kobject_uevent_env(&dev->primary->kdev->kobj,