drm/i915: Always call intel_update_sprite_watermarks() when disabling a plane

ILK and VLV codepaths didn't update sprite watermarks when disabling a
sprite. Make them do that.

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>

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 05742f7d70062baa2151025e1cec1cef54ff55b6..78b621cdd108f13ae061c27a1499df71c84da5bd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -154,6 +154,8 @@ vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)
        /* Activate double buffered register update */
        I915_MODIFY_DISPBASE(SPSURF(pipe, plane), 0);
        POSTING_READ(SPSURF(pipe, plane));
+
+       intel_update_sprite_watermarks(dplane, crtc, 0, 0, false, false);
 }
 
 static int
@@ -504,6 +506,8 @@ ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)
        /* Flush double buffered register updates */
        I915_MODIFY_DISPBASE(DVSSURF(pipe), 0);
        POSTING_READ(DVSSURF(pipe));
+
+       intel_update_sprite_watermarks(plane, crtc, 0, 0, false, false);
 }
 
 static void