tree 8ea1670d2220639f55c8f5bfe5c1764c6e5abf54
parent ca1543be2c4233fbc266bf66f4320806e61e05dd
author Paulo Zanoni <paulo.r.zanoni@intel.com> 1435672385 -0300
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1435901940 +0200

drm/i915: don't increment the FBC threshold at fbc_enable

We first set the threshold value when we're allocating the CFB, and
then later at {ilk,gen7}_fbc_enable() we increment it in case we're
using 16bpp. While that is correct, it is dangerous: if we rework the
code a little bit in a way that allows us to call intel_fbc_enable()
without necessarily calling i915_gem_stolen_setup_compression() first,
we might end up incrementing threshold more than once. To prevent
that, increment a temporary variable instead.

v2: Rebase.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>