Unify the i915 and xe interfaces by switching to the same types as i915.
Signed-off-by: Jani Nikula <[email protected]>
---
.../gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h | 8 ++++----
drivers/gpu/drm/xe/display/xe_stolen.c | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
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 42927326e567..48e3256ba37e 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
@@ -11,11 +11,11 @@
struct drm_device;
struct intel_stolen_node;
-int i915_gem_stolen_insert_node_in_range(struct intel_stolen_node *node,
- u32 size, u32 align,
- u32 start, u32 end);
+int i915_gem_stolen_insert_node_in_range(struct intel_stolen_node *node, u64
size,
+ unsigned int align, u64 start, u64
end);
-int i915_gem_stolen_insert_node(struct intel_stolen_node *node, u32 size, u32
align);
+int i915_gem_stolen_insert_node(struct intel_stolen_node *node, u64 size,
+ unsigned int align);
void i915_gem_stolen_remove_node(struct intel_stolen_node *node);
diff --git a/drivers/gpu/drm/xe/display/xe_stolen.c
b/drivers/gpu/drm/xe/display/xe_stolen.c
index d7af731d9c90..9f04ba36e930 100644
--- a/drivers/gpu/drm/xe/display/xe_stolen.c
+++ b/drivers/gpu/drm/xe/display/xe_stolen.c
@@ -11,9 +11,8 @@ struct intel_stolen_node {
struct xe_bo *bo;
};
-int i915_gem_stolen_insert_node_in_range(struct intel_stolen_node *node,
- u32 size, u32 align,
- u32 start, u32 end)
+int i915_gem_stolen_insert_node_in_range(struct intel_stolen_node *node, u64
size,
+ unsigned int align, u64 start, u64 end)
{
struct xe_device *xe = node->xe;
@@ -42,7 +41,7 @@ int i915_gem_stolen_insert_node_in_range(struct
intel_stolen_node *node,
return err;
}
-int i915_gem_stolen_insert_node(struct intel_stolen_node *node, u32 size, u32
align)
+int i915_gem_stolen_insert_node(struct intel_stolen_node *node, u64 size,
unsigned int align)
{
/* Not used on xe */
WARN_ON(1);
--
2.47.3