drm/i915: Move VT-d alignment into plane->min_alignment()

Currently we don't account for the VT-d alignment w/a in
plane->min_alignment() which means that panning inside a larger
framebuffer can still cause the plane SURF to be misaligned.
Fix the issue by moving the VT-d alignment w/a into
plane->min_alignment() itself (for the affected platforms).

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250122151755.6928-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index ed171fbf8720c0d188f673054359d9cc6c8939f1..19cc34babef3517eb888956944eddf6edfd58377 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -780,9 +780,14 @@ unsigned int vlv_plane_min_alignment(struct intel_plane *plane,
                                     const struct drm_framebuffer *fb,
                                     int color_plane)
 {
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+
        if (intel_plane_can_async_flip(plane, fb->modifier))
                return 256 * 1024;
 
+       if (intel_scanout_needs_vtd_wa(i915))
+               return 256 * 1024;
+
        switch (fb->modifier) {
        case I915_FORMAT_MOD_X_TILED:
                return 4 * 1024;
@@ -798,9 +803,14 @@ static unsigned int g4x_primary_min_alignment(struct intel_plane *plane,
                                              const struct drm_framebuffer *fb,
                                              int color_plane)
 {
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+
        if (intel_plane_can_async_flip(plane, fb->modifier))
                return 256 * 1024;
 
+       if (intel_scanout_needs_vtd_wa(i915))
+               return 256 * 1024;
+
        switch (fb->modifier) {
        case I915_FORMAT_MOD_X_TILED:
        case DRM_FORMAT_MOD_LINEAR:

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 48c3d212f690c454d89f770019aece73b76dde4d..ed8e6536453907430f82d90763863be5611d1588 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -372,6 +372,11 @@ static unsigned int i9xx_cursor_min_alignment(struct intel_plane *plane,
                                              const struct drm_framebuffer *fb,
                                              int color_plane)
 {
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+
+       if (intel_scanout_needs_vtd_wa(i915))
+               return 256 * 1024;
+
        return 4 * 1024; /* physical for i915/i945 */
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index dd3ac7f98dfcc570852c03132d460c16da5035d7..2b9ad46eaef7f69aca77d223d177026b564b6bd3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -126,14 +126,6 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
        if (drm_WARN_ON(dev, alignment && !is_power_of_2(alignment)))
                return ERR_PTR(-EINVAL);
 
-       /* Note that the w/a also requires 64 PTE of padding following the
-        * bo. We currently fill all unused PTE with the shadow page and so
-        * we should always have valid PTE following the scanout preventing
-        * the VT-d warning.
-        */
-       if (intel_scanout_needs_vtd_wa(dev_priv) && alignment < 256 * 1024)
-               alignment = 256 * 1024;
-
        /*
         * Global gtt pte registers are special registers which actually forward
         * writes to a chunk of system memory. Which means that there is no risk

diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index 13996d7059ad1879fe9892e817a2fbd63aa2c913..d63e71fe469ed8626c2392b79f0088b20e365378 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -980,6 +980,11 @@ static unsigned int g4x_sprite_min_alignment(struct intel_plane *plane,
                                             const struct drm_framebuffer *fb,
                                             int color_plane)
 {
+       struct drm_i915_private *i915 = to_i915(plane->base.dev);
+
+       if (intel_scanout_needs_vtd_wa(i915))
+               return 256 * 1024;
+
        return 4 * 1024;
 }
 

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index ba5db553c374259f8f3246c1408b55d32c8794e5..d4774abbf462a216e747dd04f514fe37394897b3 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -645,6 +645,10 @@ static u32 skl_plane_min_alignment(struct intel_plane *plane,
        if (color_plane != 0)
                return 4 * 1024;
 
+       /*
+        * VT-d needs at least 256k alignment,
+        * but that's already covered below.
+        */
        switch (fb->modifier) {
        case DRM_FORMAT_MOD_LINEAR:
        case I915_FORMAT_MOD_X_TILED: