[kernel] r19796 - dists/sid/linux/debian/patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Thu Feb  7 05:37:19 2013
New Revision: 19796

Log:
Correct misplaced code in backported i915 fix, as reported by jcristau

Modified:
   dists/sid/linux/debian/patches/bugfix/x86/drm-i915-Close-race-between-processing-unpin-task-an.patch

Modified: dists/sid/linux/debian/patches/bugfix/x86/drm-i915-Close-race-between-processing-unpin-task-an.patch
==============================================================================
--- dists/sid/linux/debian/patches/bugfix/x86/drm-i915-Close-race-between-processing-unpin-task-an.patch	Thu Feb  7 05:07:26 2013	(r19795)
+++ dists/sid/linux/debian/patches/bugfix/x86/drm-i915-Close-race-between-processing-unpin-task-an.patch	Thu Feb  7 05:37:19 2013	(r19796)
@@ -142,12 +142,19 @@
  	ADVANCE_LP_RING();
  	return 0;
  
-@@ -7442,6 +7461,10 @@ static int intel_gen4_queue_flip(struct
+@@ -7442,6 +7461,8 @@ static int intel_gen4_queue_flip(struct
  	pf = 0;
  	pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
  	OUT_RING(pf | pipesrc);
 +
 +	intel_mark_page_flip_active(intel_crtc);
+ 	ADVANCE_LP_RING();
+ 	return 0;
+ 
+@@ -7483,6 +7504,8 @@ static int intel_gen6_queue_flip(struct
+ 	pf = 0;
+ 	pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
+ 	OUT_RING(pf | pipesrc);
 +
 +	intel_mark_page_flip_active(intel_crtc);
  	ADVANCE_LP_RING();