drm/i915: Fix sprite_scaling_enabled for multiple sprites
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 8 Feb 2013 21:13:35 +0000 (23:13 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 15 Feb 2013 09:30:37 +0000 (10:30 +0100)
commit2c6602df1a7ff79c9e489602445a6d7eb728744e
tree553f9792187be83ec128a071751a3b9cd79c128f
parent26739f12cf210cb8df35969258a1f064e8e12b63
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>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_sprite.c