drm/i915/skl: Take 90/270 rotation into account in watermark calculations

v2: Pass in rotation info to sprite plane updates as well.

v3: Use helper to determine 90/270 rotation. (Michel Thierry)

v4: Rebased for fb modifiers and atomic changes.

For: VIZ-4546
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Michel Thierry <michel.thierry@intel.com> (v3)
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index e18f0fd22cf2..753a3af07333 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2840,6 +2840,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
                 }
                 p->plane[0].horiz_pixels = intel_crtc->config->pipe_src_w;
                 p->plane[0].vert_pixels = intel_crtc->config->pipe_src_h;
+                p->plane[0].rotation = crtc->primary->state->rotation;
 
                 fb = crtc->cursor->state->fb;
                 if (fb) {
@@ -2897,7 +2898,21 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 
         if (p_params->tiling == I915_FORMAT_MOD_Y_TILED ||
             p_params->tiling == I915_FORMAT_MOD_Yf_TILED) {
-                uint32_t y_tile_minimum = plane_blocks_per_line * 4;
+                uint32_t min_scanlines = 4;
+                uint32_t y_tile_minimum;
+                if (intel_rotation_90_or_270(p_params->rotation)) {
+                        switch (p_params->bytes_per_pixel) {
+                        case 1:
+                                min_scanlines = 16;
+                                break;
+                        case 2:
+                                min_scanlines = 8;
+                                break;
+                        case 8:
+                                WARN(1, "Unsupported pixel depth for rotation");
+                        };
+                }
+                y_tile_minimum = plane_blocks_per_line * min_scanlines;
                 selected_result = max(method2, y_tile_minimum);
         } else {
                 if ((ddb_allocation / plane_blocks_per_line) >= 1)
@@ -3357,6 +3372,7 @@ skl_update_sprite_wm(struct drm_plane *plane, struct drm_crtc *crtc,
          */
         if (fb)
                 intel_plane->wm.tiling = fb->modifier[0];
+        intel_plane->wm.rotation = plane->state->rotation;
 
         skl_update_wm(crtc);
 }