Use a more generic name than one that refers to "i915" and "fb".
Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 2 +- .../drm/xe/compat-i915-headers/gem/i915_gem_stolen.h | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 0d380c825791..6a7357fa89db 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -102,7 +102,7 @@ struct intel_fbc { struct mutex lock; unsigned int busy_bits; - struct i915_stolen_fb compressed_fb, compressed_llb; + struct intel_stolen_node compressed_fb, compressed_llb; enum intel_fbc_id id; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.h b/drivers/gpu/drm/i915/gem/i915_gem_stolen.h index dfe0db8bb1b9..c2f9c994e0ae 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.h @@ -12,7 +12,7 @@ struct drm_i915_private; struct drm_mm_node; struct drm_i915_gem_object; -#define i915_stolen_fb drm_mm_node +#define intel_stolen_node drm_mm_node int i915_gem_stolen_insert_node(struct drm_i915_private *i915, struct drm_mm_node *node, u64 size, diff --git a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h index f097fc6d5127..62389b290907 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h @@ -12,12 +12,12 @@ struct xe_bo; -struct i915_stolen_fb { +struct intel_stolen_node { struct xe_bo *bo; }; static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, - struct i915_stolen_fb *fb, + struct intel_stolen_node *fb, u32 size, u32 align, u32 start, u32 end) { @@ -47,7 +47,7 @@ static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, } static inline int i915_gem_stolen_insert_node(struct xe_device *xe, - struct i915_stolen_fb *fb, + struct intel_stolen_node *fb, u32 size, u32 align) { /* Not used on xe */ @@ -56,7 +56,7 @@ static inline int i915_gem_stolen_insert_node(struct xe_device *xe, } static inline void i915_gem_stolen_remove_node(struct xe_device *xe, - struct i915_stolen_fb *fb) + struct intel_stolen_node *fb) { xe_bo_unpin_map_no_vm(fb->bo); fb->bo = NULL; @@ -65,7 +65,7 @@ static inline void i915_gem_stolen_remove_node(struct xe_device *xe, #define i915_gem_stolen_initialized(xe) (!!ttm_manager_type(&(xe)->ttm, XE_PL_STOLEN)) #define i915_gem_stolen_node_allocated(fb) (!!((fb)->bo)) -static inline u32 i915_gem_stolen_node_offset(struct i915_stolen_fb *fb) +static inline u32 i915_gem_stolen_node_offset(struct intel_stolen_node *fb) { struct xe_res_cursor res; -- 2.47.3
