[ 01/66] drm/i915: Fix misplaced intel_mark_page_flip_active()

From: Ben Hutchings
Date: Sun Feb 17 2013 - 18:11:01 EST

3.2-stable review patch. If anyone has any objections, please let me know.


From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>

In commit 28c4566d30b8, backport of commit e7d841ca03b7 ('drm/i915:
Close race between processing unpin task and queueing the flip') I
somehow added two calls to intel_mark_page_flip_active() from
intel_gen4_queue_flip() and none from intel_gen6_queue_flip(). There
should of course be one from each.

Reported-by: Julien Cristau <jcristau@xxxxxxxxxx>
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7156,8 +7156,6 @@ static int intel_gen4_queue_flip(struct
OUT_RING(pf | pipesrc);

- intel_mark_page_flip_active(intel_crtc);
return 0;

@@ -7193,6 +7191,8 @@ static int intel_gen6_queue_flip(struct
pf = I915_READ(PF_CTL(intel_crtc->pipe)) & PF_ENABLE;
pipesrc = I915_READ(PIPESRC(intel_crtc->pipe)) & 0x0fff0fff;
OUT_RING(pf | pipesrc);
+ intel_mark_page_flip_active(intel_crtc);
return 0;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/