From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed, 24 Apr 2013 18:09:10 +0000 (+0300)
Subject: drm/i915: Re-enable FBC WM if the watermark is good on gen6+
X-Git-Tag: v3.11-rc1~65^2~131^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=615aaa5f96e40971039e01105c09808a3dead7d5;p=pandora-kernel.git

drm/i915: Re-enable FBC WM if the watermark is good on gen6+

If the calculated FBC watermark is no good, we simply disable FBC
watermarks. But we fail to re-enable them later if the calculated
watermark becomes good again. Fix that, but remember to leave FBC
watermarks disabled on ILK since that's required by some workarounds.

v2: Fix checkpatch complaint

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed