From: Ville Syrjälä <ville.syrj...@linux.intel.com>
We don't really need the extra intel_plane_ggtt_offset() wrapper
anymore. Get rid of it.
Reviewed-by: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_fb_pin.c | 3 ++-
drivers/gpu/drm/i915/display/intel_plane.c | 6 ------
drivers/gpu/drm/i915/display/intel_plane.h | 1 -
drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +-
drivers/gpu/drm/xe/display/xe_fb_pin.c | 3 +--
drivers/gpu/drm/xe/display/xe_plane_initial.c | 3 ++-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c
b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 5401d5b27e30..340c765d29fe 100644
--- 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 36fb07471deb..81f05ee9a21a 100644
--- 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 4ef012c08fa4..8af41ccc0a69 100644
--- 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 786edbb43dbb..a9f36b1b50c1 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -360,7 +360,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 9e5de208b6b4..0ebf6ed9f126 100644
--- 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"
@@ -434,7 +433,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 2aca28f129d3..3eab9a569661 100644
--- 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"
@@ -236,7 +237,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.49.0
