linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2025-03-24T03:06:09Z

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

drivers/gpu/drm/xe/xe_bo.h

between commit:

50af7cab7520 ("drm/xe: Fix exporting xe buffers multiple times")

from Linus' tree and commit:

00c8efc3180f ("drm/xe: Add a shrinker for xe bos")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/xe/xe_bo.h
index 43bf6f140d40,bda3fdd408da..000000000000
--- a/drivers/gpu/drm/xe/xe_bo.h
+++ b/drivers/gpu/drm/xe/xe_bo.h
@@@ -341,6 -391,21 +391,20 @@@ static inline unsigned int xe_sg_segmen
return round_down(max / 2, PAGE_SIZE);
}

+ /**
+ * struct xe_bo_shrink_flags - flags governing the shrink behaviour.
+ * @purge: Only purging allowed. Don't shrink if bo not purgeable.
+ * @writeback: Attempt to immediately move content to swap.
+ */
+ struct xe_bo_shrink_flags {
+ u32 purge : 1;
+ u32 writeback : 1;
+ };
+
+ long xe_bo_shrink(struct ttm_operation_ctx *ctx, struct ttm_buffer_object *bo,
+ const struct xe_bo_shrink_flags flags,
+ unsigned long *scanned);
+
-#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
/**
* xe_bo_is_mem_type - Whether the bo currently resides in the given
* TTM memory type

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]