Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/{i915, xe}/stolen: rename i915_stolen_fb to intel_stolen_node

Use a more generic name than one that refers to "i915" and "fb".

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/925fd07d3f2a6115c71984f5a40a06c9eb46a539.1758732183.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+7 -7
+1 -1
drivers/gpu/drm/i915/display/intel_fbc.c
··· 102 102 struct mutex lock; 103 103 unsigned int busy_bits; 104 104 105 - struct i915_stolen_fb compressed_fb, compressed_llb; 105 + struct intel_stolen_node compressed_fb, compressed_llb; 106 106 107 107 enum intel_fbc_id id; 108 108
+1 -1
drivers/gpu/drm/i915/gem/i915_gem_stolen.h
··· 12 12 struct drm_mm_node; 13 13 struct drm_i915_gem_object; 14 14 15 - #define i915_stolen_fb drm_mm_node 15 + #define intel_stolen_node drm_mm_node 16 16 17 17 int i915_gem_stolen_insert_node(struct drm_i915_private *i915, 18 18 struct drm_mm_node *node, u64 size,
+5 -5
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h
··· 12 12 13 13 struct xe_bo; 14 14 15 - struct i915_stolen_fb { 15 + struct intel_stolen_node { 16 16 struct xe_bo *bo; 17 17 }; 18 18 19 19 static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe, 20 - struct i915_stolen_fb *fb, 20 + struct intel_stolen_node *fb, 21 21 u32 size, u32 align, 22 22 u32 start, u32 end) 23 23 { ··· 47 47 } 48 48 49 49 static inline int i915_gem_stolen_insert_node(struct xe_device *xe, 50 - struct i915_stolen_fb *fb, 50 + struct intel_stolen_node *fb, 51 51 u32 size, u32 align) 52 52 { 53 53 /* Not used on xe */ ··· 56 56 } 57 57 58 58 static inline void i915_gem_stolen_remove_node(struct xe_device *xe, 59 - struct i915_stolen_fb *fb) 59 + struct intel_stolen_node *fb) 60 60 { 61 61 xe_bo_unpin_map_no_vm(fb->bo); 62 62 fb->bo = NULL; ··· 65 65 #define i915_gem_stolen_initialized(xe) (!!ttm_manager_type(&(xe)->ttm, XE_PL_STOLEN)) 66 66 #define i915_gem_stolen_node_allocated(fb) (!!((fb)->bo)) 67 67 68 - static inline u32 i915_gem_stolen_node_offset(struct i915_stolen_fb *fb) 68 + static inline u32 i915_gem_stolen_node_offset(struct intel_stolen_node *fb) 69 69 { 70 70 struct xe_res_cursor res; 71 71