github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 10:09:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: Remove the vma parent interface

Browse Source 
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
This commit is contained in:
Ville Syrjälä 2026-04-07 20:09:42 +03:00
parent eb3dd96407
commit 9fce8ff956
6 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/display/intel_parent.c
View File

@ -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)
{

3
drivers/gpu/drm/i915/display/intel_parent.h
View File

@ -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);

1
drivers/gpu/drm/i915/i915_driver.c
View File

@ -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,

10
drivers/gpu/drm/i915/i915_vma.c
View File

@ -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,
};

2
drivers/gpu/drm/i915/i915_vma.h
View File

@ -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

7
include/drm/intel/display_parent_interface.h
View File

@ -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. */