From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 8 Feb 2013 21:13:35 +0000 (+0200)
Subject: drm/i915: Fix sprite_scaling_enabled for multiple sprites
X-Git-Tag: v3.9-rc1~83^2~11^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6602df1a7ff79c9e489602445a6d7eb728744e;p=pandora-kernel.git

drm/i915: Fix sprite_scaling_enabled for multiple sprites

We have more than one sprite, so a boolean simply won't cut it.
Turn sprite_scaling_enabled into a bitmask and track the state
of sprite scaler for each sprite independently.

Also don't re-enable LP watermarks until the sprite registers
have actually been written, and thus sprite scaling has really
been disabled.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed