drm/i915: Nuke intel_plane_ggtt_offset()

We don't really need the extra intel_plane_ggtt_offset() wrapper
anymore. Get rid of it.

v2: Deal with reuse_vma() hacks

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

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 5401d5b27e30c13e07eea91868b5fcb5245ef275..340c765d29feb8b570a9d2da3c58b31dbb0e50d4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -11,6 +11,7 @@
 #include "gem/i915_gem_object.h"
 
 #include "i915_drv.h"
+#include "i915_vma.h"
 #include "intel_display_core.h"
 #include "intel_display_rpm.h"
 #include "intel_display_types.h"
@@ -312,7 +313,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
                plane_state->surf = i915_gem_object_get_dma_address(obj, 0) +
                        plane->surf_offset(plane_state);
        } else {
-               plane_state->surf = intel_plane_ggtt_offset(plane_state) +
+               plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma) +
                        plane->surf_offset(plane_state);
        }
 

diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index 36fb07471deb4b74e2be80fae3995460cd640110..81f05ee9a21a8012f7682966fc1be800db12cb96 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -46,7 +46,6 @@
 
 #include "gem/i915_gem_object.h"
 #include "i915_scheduler_types.h"
-#include "i915_vma.h"
 #include "i9xx_plane_regs.h"
 #include "intel_bo.h"
 #include "intel_cdclk.h"
@@ -1749,8 +1748,3 @@ int intel_plane_atomic_check(struct intel_atomic_state *state)
 
        return 0;
 }
-
-u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state)
-{
-       return i915_ggtt_offset(plane_state->ggtt_vma);
-}

diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
index 4ef012c08fa40a311862ee8e4a360d77a63a9842..8af41ccc0a6945b76be10028dab364da6a509cdf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -87,7 +87,6 @@ int intel_plane_add_affected(struct intel_atomic_state *state,
                             struct intel_crtc *crtc);
 int intel_plane_atomic_check(struct intel_atomic_state *state);
 
-u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
 bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
                                            u32 format,
                                            u64 modifier);

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index c506b5d660c3e8dffa9d3edbf2c007a2ab4e064e..8901bc1dd8f8454707f7af30171e07ae3b8b2ca0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -359,7 +359,7 @@ valid_fb:
            i915_vma_pin_fence(vma) == 0 && vma->fence)
                plane_state->flags |= PLANE_HAS_FENCE;
 
-       plane_state->surf = intel_plane_ggtt_offset(plane_state);
+       plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
 
        plane_state->uapi.src_x = 0;
        plane_state->uapi.src_y = 0;

diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index 38861c627476ff30d5eb70597e893ad3a31ccd42..fe1677cf1a96c965467a0c1d213c8e2517937e61 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -12,7 +12,6 @@
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
 #include "intel_fbdev.h"
-#include "intel_plane.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_ggtt.h"
@@ -407,7 +406,7 @@ found:
        refcount_inc(&vma->ref);
        new_plane_state->ggtt_vma = vma;
 
-       new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) +
+       new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) +
                plane->surf_offset(new_plane_state);
 
        return true;
@@ -437,7 +436,7 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
 
        new_plane_state->ggtt_vma = vma;
 
-       new_plane_state->surf = intel_plane_ggtt_offset(new_plane_state) +
+       new_plane_state->surf = i915_ggtt_offset(new_plane_state->ggtt_vma) +
                plane->surf_offset(new_plane_state);
 
        return 0;

diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index 2882bbd9b554270757f5284e935b483d0038799f..edda49daa24e45806f4fb2e548ffbc2e66473edb 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -10,6 +10,7 @@
 #include "xe_ggtt.h"
 #include "xe_mmio.h"
 
+#include "i915_vma.h"
 #include "intel_crtc.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
@@ -235,7 +236,7 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
 
        plane_state->ggtt_vma = vma;
 
-       plane_state->surf = intel_plane_ggtt_offset(plane_state);
+       plane_state->surf = i915_ggtt_offset(plane_state->ggtt_vma);
 
        plane_state->uapi.src_x = 0;
        plane_state->uapi.src_y = 0;