On Thu, Oct 15, 2015 at 05:04:04PM +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > We still had one lingering RMW in ivb_sprite_disable(), all the other > RMWs were killed off from the sprite code some time ago. Kill the > straggler too. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/intel_sprite.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index 7f0911e..a84cbf42 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -610,7 +610,7 @@ ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) > struct intel_plane *intel_plane = to_intel_plane(plane); > int pipe = intel_plane->pipe; > > - I915_WRITE(SPRCTL(pipe), I915_READ(SPRCTL(pipe)) & ~SPRITE_ENABLE); > + I915_WRITE(SPRCTL(pipe), 0); > /* Can't leave the scaler enabled... */ > if (intel_plane->can_scale) > I915_WRITE(SPRSCALE(pipe), 0); > -- > 2.4.9 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
