On Fri, Feb 08, 2013 at 09:26:30PM +0000, Chris Wilson wrote: > On Fri, Feb 08, 2013 at 11:13:35PM +0200, ville.syrjala at linux.intel.com wrote: > > From: Ville Syrj?l? <ville.syrjala at linux.intel.com> > > > > 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. I'm not sure whether keeping that in dev_priv is right, probably should move into a crtc flag. Otoh we have a few funny issues around watermark changes anyway already, so better fix those all up before creating havoc ... > > Also don't re-enable LP watermarks until the sprite registers > > have actually been written, and thus sprite scaling has really > > been disabled. > > I would emphasize this, since this fix is worthy of Cc: stable@ > > > Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com> > Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
