drm/i915/adl_p: Disable support for 90/270 FB rotation

The latest specification removed the support for 90/270 FB rotation on
ADL_P, even though legacy Y-tiled surfaces are supported. Align the code
accordingly.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210506161930.309688-9-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 5f4c3e5..9c0adfc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -126,8 +126,10 @@ struct intel_framebuffer {
 
        /* Params to remap the FB pages and program the plane registers in each view. */
        struct intel_fb_view normal_view;
-       struct intel_fb_view rotated_view;
-       struct intel_fb_view remapped_view;
+       union {
+               struct intel_fb_view rotated_view;
+               struct intel_fb_view remapped_view;
+       };
 
        struct i915_address_space *dpt_vm;
 };

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 21271a6..927440e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -735,6 +735,15 @@ static void intel_fb_view_init(struct intel_fb_view *view, enum i915_ggtt_view_t
        view->gtt.type = view_type;
 }
 
+bool intel_fb_supports_90_270_rotation(const struct intel_framebuffer *fb)
+{
+       if (DISPLAY_VER(to_i915(fb->base.dev)) >= 13)
+               return false;
+
+       return fb->base.modifier == I915_FORMAT_MOD_Y_TILED ||
+              fb->base.modifier == I915_FORMAT_MOD_Yf_TILED;
+}
+
 int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *fb)
 {
        struct drm_i915_gem_object *obj = intel_fb_obj(&fb->base);
@@ -745,8 +754,15 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *
        unsigned int tile_size = intel_tile_size(i915);
 
        intel_fb_view_init(&fb->normal_view, I915_GGTT_VIEW_NORMAL);
-       intel_fb_view_init(&fb->rotated_view, I915_GGTT_VIEW_ROTATED);
-       intel_fb_view_init(&fb->remapped_view, I915_GGTT_VIEW_REMAPPED);
+
+       drm_WARN_ON(&i915->drm,
+                   intel_fb_supports_90_270_rotation(fb) &&
+                   intel_fb_needs_pot_stride_remap(fb));
+
+       if (intel_fb_supports_90_270_rotation(fb))
+               intel_fb_view_init(&fb->rotated_view, I915_GGTT_VIEW_ROTATED);
+       if (intel_fb_needs_pot_stride_remap(fb))
+               intel_fb_view_init(&fb->remapped_view, I915_GGTT_VIEW_REMAPPED);
 
        for (i = 0; i < num_planes; i++) {
                struct fb_plane_view_dims view_dims;
@@ -787,9 +803,7 @@ int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *
 
                offset = calc_plane_aligned_offset(fb, i, &x, &y);
 
-               /* Y or Yf modifiers required for 90/270 rotation */
-               if (fb->base.modifier == I915_FORMAT_MOD_Y_TILED ||
-                   fb->base.modifier == I915_FORMAT_MOD_Yf_TILED)
+               if (intel_fb_supports_90_270_rotation(fb))
                        gtt_offset_rotated += calc_plane_remap_info(fb, i, &view_dims,
                                                                    offset, gtt_offset_rotated, x, y,
                                                                    &fb->rotated_view);

diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index 7cec77b..d77d9f9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -45,6 +45,8 @@ u32 intel_plane_compute_aligned_offset(int *x, int *y,
                                       const struct intel_plane_state *state,
                                       int color_plane);
 
+bool intel_fb_supports_90_270_rotation(const struct intel_framebuffer *fb);
+
 int intel_fill_fb_info(struct drm_i915_private *i915, struct intel_framebuffer *fb);
 void intel_fb_fill_view(const struct intel_framebuffer *fb, unsigned int rotation,
                        struct intel_fb_view *view);

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 1261ed9..8588b70 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1166,8 +1166,7 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
        }
 
        if (drm_rotation_90_or_270(rotation)) {
-               if (fb->modifier != I915_FORMAT_MOD_Y_TILED &&
-                   fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
+               if (!intel_fb_supports_90_270_rotation(to_intel_framebuffer(fb))) {
                        drm_dbg_kms(&dev_priv->drm,
                                    "Y/Yf tiling required for 90/270!\n");
                        return -EINVAL;