Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe/stolen: rename fb to node in stolen compat header
It's more about node than fb, and this makes more sense now that the
struct is also named intel_stolen_node.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/71a7872e47da5f3fbe61cc21723bfcf8ff6518b8.1758732183.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+12
-12
+12
-12
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h
+12
-12
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h
···
17
17
};
18
18
19
19
static inline int i915_gem_stolen_insert_node_in_range(struct xe_device *xe,
20
-
struct intel_stolen_node *fb,
20
+
struct intel_stolen_node *node,
21
21
u32 size, u32 align,
22
22
u32 start, u32 end)
23
23
{
···
41
41
return err;
42
42
}
43
43
44
-
fb->bo = bo;
44
+
node->bo = bo;
45
45
46
46
return err;
47
47
}
48
48
49
49
static inline int i915_gem_stolen_insert_node(struct xe_device *xe,
50
-
struct intel_stolen_node *fb,
50
+
struct intel_stolen_node *node,
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 intel_stolen_node *fb)
59
+
struct intel_stolen_node *node)
60
60
{
61
-
xe_bo_unpin_map_no_vm(fb->bo);
62
-
fb->bo = NULL;
61
+
xe_bo_unpin_map_no_vm(node->bo);
62
+
node->bo = NULL;
63
63
}
64
64
65
65
#define i915_gem_stolen_initialized(xe) (!!ttm_manager_type(&(xe)->ttm, XE_PL_STOLEN))
66
-
#define i915_gem_stolen_node_allocated(fb) (!!((fb)->bo))
66
+
#define i915_gem_stolen_node_allocated(node) (!!((node)->bo))
67
67
68
-
static inline u32 i915_gem_stolen_node_offset(struct intel_stolen_node *fb)
68
+
static inline u32 i915_gem_stolen_node_offset(struct intel_stolen_node *node)
69
69
{
70
70
struct xe_res_cursor res;
71
71
72
-
xe_res_first(fb->bo->ttm.resource, 0, 4096, &res);
72
+
xe_res_first(node->bo->ttm.resource, 0, 4096, &res);
73
73
return res.start;
74
74
}
75
75
···
78
78
/* Used for gen9 specific WA. Gen9 is not supported by Xe */
79
79
#define i915_gem_stolen_area_size(xe) (!WARN_ON(1))
80
80
81
-
#define i915_gem_stolen_node_address(xe, fb) (xe_ttm_stolen_gpu_offset(xe) + \
82
-
i915_gem_stolen_node_offset(fb))
83
-
#define i915_gem_stolen_node_size(fb) ((u64)((fb)->bo->ttm.base.size))
81
+
#define i915_gem_stolen_node_address(xe, node) (xe_ttm_stolen_gpu_offset(xe) + \
82
+
i915_gem_stolen_node_offset(node))
83
+
#define i915_gem_stolen_node_size(node) ((u64)((node)->bo->ttm.base.size))
84
84
85
85
#endif