Return-Path: Message-Id: <20130217225001.814892455@decadent.org.uk> Date: Sun, 17 Feb 2013 22:50:02 +0000 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: akpm@linux-foundation.org, Julien Cristau , Chris Wilson , Daniel Vetter Subject: [ 01/66] drm/i915: Fix misplaced intel_mark_page_flip_active() In-Reply-To: <20130217225001.621306883@decadent.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings 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 Cc: Chris Wilson Cc: Daniel Vetter Signed-off-by: Ben Hutchings --- --- 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); - - intel_mark_page_flip_active(intel_crtc); ADVANCE_LP_RING(); 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); ADVANCE_LP_RING(); return 0;