drm/i915/gvt: Remove intel_gvt_ggtt_h2g<->index

intel_gvt_ggtt_h2g_index() and intel_gvt_ggtt_index_g2h() were
added in 2016 by
commit 2707e4446688 ("drm/i915/gvt: vGPU graphics memory virtualization")
but haven't been used.

Remove them.

They were the only users of intel_gvt_ggtt_gmadr_g2h() and
intel_gvt_ggtt_gmadr_h2g().

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Zhenyu Wang <zhenyuw.linux@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241222002043.173080-2-linux@treblig.org
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c
index 1bce1493b86ff4b6eba25c2bb83619553f0940a9..464fb17e82ee740ca2a2a9e337e1b95935e03908 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/gtt.c
+++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -71,72 +71,6 @@ bool intel_gvt_ggtt_validate_range(struct intel_vgpu *vgpu, u64 addr, u32 size)
        return false;
 }
 
-/* translate a guest gmadr to host gmadr */
-int intel_gvt_ggtt_gmadr_g2h(struct intel_vgpu *vgpu, u64 g_addr, u64 *h_addr)
-{
-       struct drm_i915_private *i915 = vgpu->gvt->gt->i915;
-
-       if (drm_WARN(&i915->drm, !vgpu_gmadr_is_valid(vgpu, g_addr),
-                    "invalid guest gmadr %llx\n", g_addr))
-               return -EACCES;
-
-       if (vgpu_gmadr_is_aperture(vgpu, g_addr))
-               *h_addr = vgpu_aperture_gmadr_base(vgpu)
-                         + (g_addr - vgpu_aperture_offset(vgpu));
-       else
-               *h_addr = vgpu_hidden_gmadr_base(vgpu)
-                         + (g_addr - vgpu_hidden_offset(vgpu));
-       return 0;
-}
-
-/* translate a host gmadr to guest gmadr */
-int intel_gvt_ggtt_gmadr_h2g(struct intel_vgpu *vgpu, u64 h_addr, u64 *g_addr)
-{
-       struct drm_i915_private *i915 = vgpu->gvt->gt->i915;
-
-       if (drm_WARN(&i915->drm, !gvt_gmadr_is_valid(vgpu->gvt, h_addr),
-                    "invalid host gmadr %llx\n", h_addr))
-               return -EACCES;
-
-       if (gvt_gmadr_is_aperture(vgpu->gvt, h_addr))
-               *g_addr = vgpu_aperture_gmadr_base(vgpu)
-                       + (h_addr - gvt_aperture_gmadr_base(vgpu->gvt));
-       else
-               *g_addr = vgpu_hidden_gmadr_base(vgpu)
-                       + (h_addr - gvt_hidden_gmadr_base(vgpu->gvt));
-       return 0;
-}
-
-int intel_gvt_ggtt_index_g2h(struct intel_vgpu *vgpu, unsigned long g_index,
-                            unsigned long *h_index)
-{
-       u64 h_addr;
-       int ret;
-
-       ret = intel_gvt_ggtt_gmadr_g2h(vgpu, g_index << I915_GTT_PAGE_SHIFT,
-                                      &h_addr);
-       if (ret)
-               return ret;
-
-       *h_index = h_addr >> I915_GTT_PAGE_SHIFT;
-       return 0;
-}
-
-int intel_gvt_ggtt_h2g_index(struct intel_vgpu *vgpu, unsigned long h_index,
-                            unsigned long *g_index)
-{
-       u64 g_addr;
-       int ret;
-
-       ret = intel_gvt_ggtt_gmadr_h2g(vgpu, h_index << I915_GTT_PAGE_SHIFT,
-                                      &g_addr);
-       if (ret)
-               return ret;
-
-       *g_index = g_addr >> I915_GTT_PAGE_SHIFT;
-       return 0;
-}
-
 #define gtt_type_is_entry(type) \
        (type > GTT_TYPE_INVALID && type < GTT_TYPE_PPGTT_ENTRY \
         && type != GTT_TYPE_PPGTT_PTE_ENTRY \

diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 2c95aeef4e4156a32d340cd86a39421f276b08f8..8580c6d057e79d3eb7720f61b9c2028c756a41dd 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -531,12 +531,6 @@ int intel_gvt_set_edid(struct intel_vgpu *vgpu, int port_num);
            gvt_gmadr_is_hidden(gvt, gmadr))
 
 bool intel_gvt_ggtt_validate_range(struct intel_vgpu *vgpu, u64 addr, u32 size);
-int intel_gvt_ggtt_gmadr_g2h(struct intel_vgpu *vgpu, u64 g_addr, u64 *h_addr);
-int intel_gvt_ggtt_gmadr_h2g(struct intel_vgpu *vgpu, u64 h_addr, u64 *g_addr);
-int intel_gvt_ggtt_index_g2h(struct intel_vgpu *vgpu, unsigned long g_index,
-                            unsigned long *h_index);
-int intel_gvt_ggtt_h2g_index(struct intel_vgpu *vgpu, unsigned long h_index,
-                            unsigned long *g_index);
 
 void intel_vgpu_init_cfg_space(struct intel_vgpu *vgpu,
                bool primary);