drm/i915: Pass intel_display to intel_scanout_needs_vtd_wa()

Now that intel_scanout_needs_vtd_wa() is no longer used from
the gem code we can convert it to take struct intel_display.
which will help with converting the low level plane code over
as well.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250206185533.32306-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 bd3f8db13700730ff9e572452ece8672d357166c..110ad49884be4f9ed7d8fff950894464a530e513 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -780,13 +780,13 @@ 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);
+       struct intel_display *display = to_intel_display(plane);
 
        if (intel_plane_can_async_flip(plane, fb->modifier))
                return 256 * 1024;
 
        /* FIXME undocumented so not sure what's actually needed */
-       if (intel_scanout_needs_vtd_wa(i915))
+       if (intel_scanout_needs_vtd_wa(display))
                return 256 * 1024;
 
        switch (fb->modifier) {
@@ -804,12 +804,12 @@ 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);
+       struct intel_display *display = to_intel_display(plane);
 
        if (intel_plane_can_async_flip(plane, fb->modifier))
                return 256 * 1024;
 
-       if (intel_scanout_needs_vtd_wa(i915))
+       if (intel_scanout_needs_vtd_wa(display))
                return 256 * 1024;
 
        switch (fb->modifier) {
@@ -865,6 +865,7 @@ static const struct drm_plane_funcs i8xx_plane_funcs = {
 struct intel_plane *
 intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
 {
+       struct intel_display *display = &dev_priv->display;
        struct intel_plane *plane;
        const struct drm_plane_funcs *plane_funcs;
        unsigned int supported_rotations;
@@ -959,7 +960,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
                plane->min_alignment = i9xx_plane_min_alignment;
 
        /* FIXME undocumented for VLV/CHV so not sure what's actually needed */
-       if (intel_scanout_needs_vtd_wa(dev_priv))
+       if (intel_scanout_needs_vtd_wa(display))
                plane->vtd_guard = 128;
 
        if (IS_I830(dev_priv) || IS_I845G(dev_priv)) {

diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 6a1035a22b0a3b2cb3d25f0cb5dd89774e82e4e2..791557b99d9456a2a03f14927db9c4e83833737e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -372,9 +372,9 @@ 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);
+       struct intel_display *display = to_intel_display(plane);
 
-       if (intel_scanout_needs_vtd_wa(i915))
+       if (intel_scanout_needs_vtd_wa(display))
                return 64 * 1024;
 
        return 4 * 1024; /* physical for i915/i945 */
@@ -989,6 +989,7 @@ struct intel_plane *
 intel_cursor_plane_create(struct drm_i915_private *dev_priv,
                          enum pipe pipe)
 {
+       struct intel_display *display = &dev_priv->display;
        struct intel_plane *cursor;
        int ret, zpos;
        u64 *modifiers;
@@ -1019,7 +1020,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,
                else
                        cursor->min_alignment = i9xx_cursor_min_alignment;
 
-               if (intel_scanout_needs_vtd_wa(dev_priv))
+               if (intel_scanout_needs_vtd_wa(display))
                        cursor->vtd_guard = 2;
 
                cursor->update_arm = i9xx_cursor_update_arm;

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b68ccf12c439c664a0b1d7817edd80e326841de8..993ffd2187405140ae92dc3a1d4876df282a4dcb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8784,7 +8784,9 @@ void intel_hpd_poll_fini(struct drm_i915_private *i915)
        drm_connector_list_iter_end(&conn_iter);
 }
 
-bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915)
+bool intel_scanout_needs_vtd_wa(struct intel_display *display)
 {
-       return IS_DISPLAY_VER(i915, 6, 11) && i915_vtd_active(i915);
+       struct drm_i915_private *i915 = to_i915(display->drm);
+
+       return IS_DISPLAY_VER(display, 6, 11) && i915_vtd_active(i915);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 49a246feb1ae4f605f35394227b86b7cdd132f60..793c9d30c582c0bf51f9fca26939862bef9b8a47 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -596,7 +596,7 @@ bool assert_port_valid(struct drm_i915_private *i915, enum port port);
        unlikely(__ret_warn_on);                                        \
 })
 
-bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915);
+bool intel_scanout_needs_vtd_wa(struct intel_display *display);
 int intel_crtc_num_joined_pipes(const struct intel_crtc_state *crtc_state);
 
 #endif

diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index a6b27798fdc3f493d94c8b8d2809057489b5330b..d873c3ea5fa6b2857f051973312ab94b6a6e9ed3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -980,9 +980,9 @@ 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);
+       struct intel_display *display = to_intel_display(plane);
 
-       if (intel_scanout_needs_vtd_wa(i915))
+       if (intel_scanout_needs_vtd_wa(display))
                return 128 * 1024;
 
        return 4 * 1024;
@@ -1610,7 +1610,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                plane->min_cdclk = vlv_plane_min_cdclk;
 
                /* FIXME undocumented for VLV/CHV so not sure what's actually needed */
-               if (intel_scanout_needs_vtd_wa(dev_priv))
+               if (intel_scanout_needs_vtd_wa(display))
                        plane->vtd_guard = 128;
 
                if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B) {
@@ -1639,7 +1639,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
 
                plane->min_alignment = g4x_sprite_min_alignment;
 
-               if (intel_scanout_needs_vtd_wa(dev_priv))
+               if (intel_scanout_needs_vtd_wa(display))
                        plane->vtd_guard = 64;
 
                formats = snb_sprite_formats;
@@ -1656,7 +1656,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                plane->min_alignment = g4x_sprite_min_alignment;
                plane->min_cdclk = g4x_sprite_min_cdclk;
 
-               if (intel_scanout_needs_vtd_wa(dev_priv))
+               if (intel_scanout_needs_vtd_wa(display))
                        plane->vtd_guard = 64;
 
                if (IS_SANDYBRIDGE(dev_priv)) {

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index ee93361bba097e30f21f4994947f92f3e18c3f24..e166e1915afa13b1d34acf4943b604e4e56967f3 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2697,6 +2697,7 @@ struct intel_plane *
 skl_universal_plane_create(struct drm_i915_private *dev_priv,
                           enum pipe pipe, enum plane_id plane_id)
 {
+       struct intel_display *display = &dev_priv->display;
        const struct drm_plane_funcs *plane_funcs;
        struct intel_plane *plane;
        enum drm_plane_type plane_type;
@@ -2750,7 +2751,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
        else
                plane->min_alignment = skl_plane_min_alignment;
 
-       if (intel_scanout_needs_vtd_wa(dev_priv))
+       if (intel_scanout_needs_vtd_wa(display))
                plane->vtd_guard = DISPLAY_VER(dev_priv) >= 10 ? 168 : 136;
 
        if (DISPLAY_VER(dev_priv) >= 11) {