drm/i915: Remove the vma parent interface

With the fb pinning stuff directly returning the fence_id
there is no longer any need for the vma parent interface.
Get rid of it.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260407170942.16515-2-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_parent.c b/drivers/gpu/drm/i915/display/intel_parent.c
index 47ce3b6fdd5bdc94a099efc5eb54e700051ef953..67b21a42d35455bd2f191ff1eaea936a34af22f0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_parent.c
+++ b/drivers/gpu/drm/i915/display/intel_parent.c
@@ -372,15 +372,6 @@ int intel_parent_vlv_iosf_write(struct intel_display *display, enum vlv_iosf_sb_
        return display->parent->vlv_iosf->write(display->drm, unit, addr, val);
 }
 
-/* vma */
-int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma)
-{
-       if (!display->parent->vma)
-               return -1;
-
-       return display->parent->vma->fence_id(vma);
-}
-
 /* generic */
 void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_parent.h b/drivers/gpu/drm/i915/display/intel_parent.h
index 1e89d24163cc912b3089bef6bf991148f78fa0a1..5f0c835b94163373a0a04b41ff7e71ae353b096a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_parent.h
+++ b/drivers/gpu/drm/i915/display/intel_parent.h
@@ -116,9 +116,6 @@ void intel_parent_vlv_iosf_put(struct intel_display *display, unsigned long unit
 u32 intel_parent_vlv_iosf_read(struct intel_display *display, enum vlv_iosf_sb_unit unit, u32 addr);
 int intel_parent_vlv_iosf_write(struct intel_display *display, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);
 
-/* vma */
-int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma);
-
 /* generic */
 bool intel_parent_has_auxccs(struct intel_display *display);
 bool intel_parent_has_fenced_regions(struct intel_display *display);

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 129013c5fb4278e45d634cb95f61fcf94ca1af8a..195e34acef301f5f746a85a512bf344d33d6bcad 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -780,7 +780,6 @@ static const struct intel_display_parent_interface parent = {
        .rps = &i915_display_rps_interface,
        .stolen = &i915_display_stolen_interface,
        .vlv_iosf = &i915_display_vlv_iosf_interface,
-       .vma = &i915_display_vma_interface,
 
        .fence_priority_display = fence_priority_display,
        .has_auxccs = has_auxccs,

diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 6a3a4d4244dc359b4d34b2a9edb2e175b4feff02..afc192d9931b887c7fb1964151062436b10320bd 100644 (file)
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -27,7 +27,6 @@
 
 #include <drm/drm_gem.h>
 #include <drm/drm_print.h>
-#include <drm/intel/display_parent_interface.h>
 
 #include "display/intel_fb.h"
 #include "display/intel_frontbuffer.h"
@@ -2333,12 +2332,3 @@ int __init i915_vma_module_init(void)
 
        return 0;
 }
-
-static int i915_vma_fence_id(const struct i915_vma *vma)
-{
-       return vma->fence ? vma->fence->id : -1;
-}
-
-const struct intel_display_vma_interface i915_display_vma_interface = {
-       .fence_id = i915_vma_fence_id,
-};

diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index fa2d9b429db68b3446b76230427537e795a406a1..892306ab935dcca9805b37114026fb56891ad9a6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -476,6 +476,4 @@ int i915_vma_module_init(void);
 I915_SELFTEST_DECLARE(int i915_vma_get_pages(struct i915_vma *vma));
 I915_SELFTEST_DECLARE(void i915_vma_put_pages(struct i915_vma *vma));
 
-extern const struct intel_display_vma_interface i915_display_vma_interface;
-
 #endif

diff --git a/include/drm/intel/display_parent_interface.h b/include/drm/intel/display_parent_interface.h
index b513e3f9924d3ce8bd1c6c2e9a7795ebfb9cccbd..270dc028bec273edbd967bd7356f004124a4f448 100644 (file)
--- a/include/drm/intel/display_parent_interface.h
+++ b/include/drm/intel/display_parent_interface.h
@@ -189,10 +189,6 @@ struct intel_display_vlv_iosf_interface {
        int (*write)(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);
 };
 
-struct intel_display_vma_interface {
-       int (*fence_id)(const struct i915_vma *vma);
-};
-
 /**
  * struct intel_display_parent_interface - services parent driver provides to display
  *
@@ -251,9 +247,6 @@ struct intel_display_parent_interface {
        /** @vlv_iosf: VLV IOSF sideband. Optional. */
        const struct intel_display_vlv_iosf_interface *vlv_iosf;
 
-       /** @vma: VMA interface. Optional. */
-       const struct intel_display_vma_interface *vma;
-
        /* Generic independent functions */
        struct {
                /** @fence_priority_display: Set display priority. Optional. */