From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 17 Apr 2012 18:35:53 +0000 (+0100)
Subject: drm/i915: Unpin the flip target if we fail to queue the flip
X-Git-Tag: v3.2.21~64
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1550894983f409ec89c74584575e8bd975dd918;p=pandora-kernel.git

drm/i915: Unpin the flip target if we fail to queue the flip

commit 83d4092b0381e5dd6f312b2ec57121dcf0fcbade upstream.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[bwh: Backported to 3.2:
 - adjust context
 - we don't have intel_unpin_fb_obj(); use i915_gem_object_unpin()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

Reading git-diff-tree failed