drm/i915: add "enable" argument to intel_update_sprite_watermarks

Because we want to call it from the "sprite disable" paths, since on
Haswell we need to update the sprite watermarks when we disable
sprites.

For now, all this patch does is to add the "enable" argument and call
intel_update_sprite_watermarks from inside ivb_disable_plane. This
shouldn't change how the code behaves because on
sandybridge_update_sprite_wm we just ignore the "!enable" case. The
patches that implement Haswell watermarks will make use of the changes
introduced by this patch.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 19b9cb961b5a..04d38d4d811a 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -114,7 +114,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_framebuffer *fb,
         crtc_w--;
         crtc_h--;
 
-        intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size);
+        intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true);
 
         I915_WRITE(SPSTRIDE(pipe, plane), fb->pitches[0]);
         I915_WRITE(SPPOS(pipe, plane), (crtc_y << 16) | crtc_x);
@@ -268,7 +268,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
         crtc_w--;
         crtc_h--;
 
-        intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size);
+        intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true);
 
         /*
          * IVB workaround: must disable low power watermarks for at least
@@ -335,6 +335,8 @@ ivb_disable_plane(struct drm_plane *plane)
 
         dev_priv->sprite_scaling_enabled &= ~(1 << pipe);
 
+        intel_update_sprite_watermarks(dev, pipe, 0, 0, false);
+
         /* potentially re-enable LP watermarks */
         if (scaling_was_enabled && !dev_priv->sprite_scaling_enabled)
                 intel_update_watermarks(dev);
@@ -453,7 +455,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
         crtc_w--;
         crtc_h--;
 
-        intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size);
+        intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true);
 
         dvsscale = 0;
         if (IS_GEN5(dev) || crtc_w != src_w || crtc_h != src_h)