1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index dd2d5683fcb1..56dc132e8e20 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -192,6 +192,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
         const int pipe = intel_plane->pipe;
         const int plane = intel_plane->plane + 1;
         u32 plane_ctl, stride_div, stride;
+        int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0);
         const struct drm_intel_sprite_colorkey *key =
                 &to_intel_plane_state(drm_plane->state)->ckey;
         unsigned long surf_addr;
@@ -202,6 +203,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
         int scaler_id;
 
         plane_ctl = PLANE_CTL_ENABLE |
+                PLANE_CTL_PIPE_GAMMA_ENABLE |
                 PLANE_CTL_PIPE_CSC_ENABLE;
 
         plane_ctl |= skl_plane_ctl_format(fb->pixel_format);
@@ -210,6 +212,10 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
         rotation = drm_plane->state->rotation;
         plane_ctl |= skl_plane_ctl_rotation(rotation);
 
+        intel_update_sprite_watermarks(drm_plane, crtc, src_w, src_h,
+                                       pixel_size, true,
+                                       src_w != crtc_w || src_h != crtc_h);
+
         stride_div = intel_fb_stride_alignment(dev, fb->modifier[0],
                                                fb->pixel_format);
 
@@ -291,6 +297,8 @@ skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)
 
         I915_WRITE(PLANE_SURF(pipe, plane), 0);
         POSTING_READ(PLANE_SURF(pipe, plane));
+
+        intel_update_sprite_watermarks(dplane, crtc, 0, 0, 0, false, false);
 }
 
 static void
@@ -533,6 +541,10 @@ ivb_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
         if (IS_HASWELL(dev) || IS_BROADWELL(dev))
                 sprctl |= SPRITE_PIPE_CSC_ENABLE;
 
+        intel_update_sprite_watermarks(plane, crtc, src_w, src_h, pixel_size,
+                                       true,
+                                       src_w != crtc_w || src_h != crtc_h);
+
         /* Sizes are 0 based */
         src_w--;
         src_h--;
@@ -601,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);
@@ -666,6 +678,10 @@ ilk_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
         if (IS_GEN6(dev))
                 dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */
 
+        intel_update_sprite_watermarks(plane, crtc, src_w, src_h,
+                                       pixel_size, true,
+                                       src_w != crtc_w || src_h != crtc_h);
+
         /* Sizes are 0 based */
         src_w--;
         src_h--;