From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: [PATCH 2/9] drm/i915: Nuke intel_plane_ggtt_offset()
Date: Wed, 2 Apr 2025 03:22:02 +0300 [thread overview]
Message-ID: <20250402002209.24987-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20250402002209.24987-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We don't really need the extra intel_plane_ggtt_offset() wrapper
anymore. Get rid of it.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 5 -----
drivers/gpu/drm/i915/display/intel_atomic_plane.h | 2 --
drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +-
drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +-
drivers/gpu/drm/xe/display/xe_fb_pin.c | 2 +-
drivers/gpu/drm/xe/display/xe_plane_initial.c | 2 +-
6 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 7276179df878..264a50b29c16 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -1565,8 +1565,3 @@ int intel_atomic_check_planes(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_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
index 6efac923dcbc..65edd88d28a9 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
@@ -88,6 +88,4 @@ int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
struct intel_crtc *crtc);
int intel_atomic_check_planes(struct intel_atomic_state *state);
-u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
-
#endif /* __INTEL_ATOMIC_PLANE_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index fb7d0c8b9302..f2d8675dd98a 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -311,7 +311,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_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 1c49610eb42f..3afff528a7bd 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -356,7 +356,7 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
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 b9c45a5a3d82..b2e979805455 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -438,7 +438,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 a15f60835239..c563edf14b1a 100644
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -239,7 +239,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;
--
2.45.3
next prev parent reply other threads:[~2025-04-02 0:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-02 0:22 [PATCH 0/9] drm/i915: Precompute plane SURF address/etc Ville Syrjala
2025-04-02 0:22 ` [PATCH 1/9] drm/i915: Precompute plane SURF address Ville Syrjala
2025-04-02 0:22 ` Ville Syrjala [this message]
2025-04-02 0:22 ` [PATCH 3/9] drm/i915: Move the intel_dpt_offset() check into intel_plane_pin_fb() Ville Syrjala
2025-04-02 0:22 ` [PATCH 4/9] drm/i915: Use i915_vma_offset() in intel_dpt_offset() Ville Syrjala
2025-04-02 0:22 ` [PATCH 5/9] drm/i915: Remove unused dpt_total_entries() Ville Syrjala
2025-04-02 0:22 ` [PATCH 6/9] drm/i915: Don't pass crtc_state to foo_plane_ctl() & co Ville Syrjala
2025-04-02 0:22 ` [PATCH 7/9] drm/i915: Include crtc contributed bits in plane_state->ctl Ville Syrjala
2025-04-02 0:22 ` [PATCH 8/9] drm/i915: Add tracepoint for plane faults Ville Syrjala
2025-04-02 0:22 ` [PATCH 9/9] drm/i915: Include plane ctl/surf registers in the plane update_arm() tracepoint Ville Syrjala
2025-04-02 1:42 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Precompute plane SURF address/etc Patchwork
2025-04-02 1:42 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-04-02 2:02 ` ✓ i915.CI.BAT: success " Patchwork
2025-04-02 4:33 ` ✗ i915.CI.Full: failure " Patchwork
2025-04-02 15:00 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250402002209.24987-3-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox