From: Ville Syrjälä Date: Thu, 15 Oct 2015 14:04:04 +0000 (+0300) Subject: drm/i915: Kill the leftover RMW from ivb_sprite_disable() X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1286 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c562657a75282afb00498ea82949ba7a9944ed15;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Kill the leftover RMW from ivb_sprite_disable() 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ä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index e70b6fc2c6c5..56dc132e8e20 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -613,7 +613,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);