drm/i915: Fix misplaced intel_mark_page_flip_active()
authorBen Hutchings <ben@decadent.org.uk>
Thu, 7 Feb 2013 05:28:14 +0000 (05:28 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 20 Feb 2013 03:15:18 +0000 (03:15 +0000)
commit60721982a634a2f88f2887fab3eab2853c6b7b0d
tree0caadd3bef0700d48adda8719759e71e123b7b58
parent8eedd52017a07a5bae2aded2b5023bfba5971af9
drm/i915: Fix misplaced intel_mark_page_flip_active()

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@debian.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/i915/intel_display.c