diff options
| author | Imre Deak <imre.deak@intel.com> | 2021-05-06 19:19:28 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2021-05-07 11:13:01 +0300 |
| commit | d3b4aa43eea3aebea51bfb02ca5ce93df0abc9c4 (patch) | |
| tree | f5da2f0ead8d6e5efeae03c1863de9804da14195 /drivers/gpu/drm/i915/display/intel_fb.c | |
| parent | 2ac5620fbe31d4a2364b82390deaf59892a0d4f4 (diff) | |
| download | linux-d3b4aa43eea3aebea51bfb02ca5ce93df0abc9c4.tar.gz linux-d3b4aa43eea3aebea51bfb02ca5ce93df0abc9c4.tar.bz2 linux-d3b4aa43eea3aebea51bfb02ca5ce93df0abc9c4.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_fb.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fb.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 21271a6976f1..927440ed14f4 100644 --- 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); |