| From ef2b3ae3fa3283fd1ad101a17faf8fb24f6e10db Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 20 Mar 2023 11:05:18 +0200 |
| Subject: drm/i915/dpt: Only do the POT stride remap when using DPT |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| |
| [ Upstream commit ef5cb493a9acd7d97870d6e542020980ae3f3483 ] |
| |
| If we want to test with DPT disabled on ADL the POT stride remap |
| stuff needs to be disabled. Make it depend on actual DPT usage |
| instead of just assuming it based on the modifier. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20230320090522.9909-3-ville.syrjala@linux.intel.com |
| Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> |
| Stable-dep-of: 324b70e997aa ("drm/i915: Fix ADL+ tiled plane stride when the POT stride is smaller than the original") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/i915/display/intel_fb.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c |
| index 23d854bd73b77..c22ca36a38a9d 100644 |
| --- a/drivers/gpu/drm/i915/display/intel_fb.c |
| +++ b/drivers/gpu/drm/i915/display/intel_fb.c |
| @@ -1176,7 +1176,7 @@ bool intel_fb_needs_pot_stride_remap(const struct intel_framebuffer *fb) |
| { |
| struct drm_i915_private *i915 = to_i915(fb->base.dev); |
| |
| - return IS_ALDERLAKE_P(i915) && fb->base.modifier != DRM_FORMAT_MOD_LINEAR; |
| + return IS_ALDERLAKE_P(i915) && intel_fb_uses_dpt(&fb->base); |
| } |
| |
| static int intel_fb_pitch(const struct intel_framebuffer *fb, int color_plane, unsigned int rotation) |
| -- |
| 2.43.0 |
| |
