Re: [PATCH 2/2] drm/i915: Remove the vma parent interface

[Jani Nikula <jani.nikula@linux.intel.com>]

On Tue, 31 Mar 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> 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.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_parent.c  |  9 ---------
>  drivers/gpu/drm/i915/display/intel_parent.h  |  3 ---
>  drivers/gpu/drm/i915/i915_driver.c           |  1 -
>  drivers/gpu/drm/i915/i915_vma.c              | 10 ----------
>  drivers/gpu/drm/i915/i915_vma.h              |  2 --
>  include/drm/intel/display_parent_interface.h |  7 -------
>  6 files changed, 32 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_parent.c b/drivers/gpu/drm/i915/display/intel_parent.c
> index 2e3bad2b3e6b..4142fe3eed7c 100644
> --- a/drivers/gpu/drm/i915/display/intel_parent.c
> +++ b/drivers/gpu/drm/i915/display/intel_parent.c
> @@ -338,15 +338,6 @@ void intel_parent_stolen_node_free(struct intel_display *display, const struct i
>  	display->parent->stolen->node_free(node);
>  }
>  
> -/* 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 2013e5ed5aa9..c1214d3329a8 100644
> --- a/drivers/gpu/drm/i915/display/intel_parent.h
> +++ b/drivers/gpu/drm/i915/display/intel_parent.h
> @@ -109,9 +109,6 @@ u64 intel_parent_stolen_node_size(struct intel_display *display, const struct in
>  struct intel_stolen_node *intel_parent_stolen_node_alloc(struct intel_display *display);
>  void intel_parent_stolen_node_free(struct intel_display *display, const struct intel_stolen_node *node);
>  
> -/* 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 385a634c3ed0..6dde714d4646 100644
> --- 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 = {
>  	.rpm = &i915_display_rpm_interface,
>  	.rps = &i915_display_rps_interface,
>  	.stolen = &i915_display_stolen_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 6a3a4d4244dc..afc192d9931b 100644
> --- 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 fa2d9b429db6..892306ab935d 100644
> --- 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 97ec94a2e749..aef6a16efd90 100644
> --- a/include/drm/intel/display_parent_interface.h
> +++ b/include/drm/intel/display_parent_interface.h
> @@ -176,10 +176,6 @@ struct intel_display_stolen_interface {
>  	void (*node_free)(const struct intel_stolen_node *node);
>  };
>  
> -struct intel_display_vma_interface {
> -	int (*fence_id)(const struct i915_vma *vma);
> -};
> -
>  /**
>   * struct intel_display_parent_interface - services parent driver provides to display
>   *
> @@ -235,9 +231,6 @@ struct intel_display_parent_interface {
>  	/** @stolen: Stolen memory. */
>  	const struct intel_display_stolen_interface *stolen;
>  
> -	/** @vma: VMA interface. Optional. */
> -	const struct intel_display_vma_interface *vma;
> -
>  	/* Generic independent functions */
>  	struct {
>  		/** @fence_priority_display: Set display priority. Optional. */

-- 
Jani Nikula, Intel