From: Mark Brown <broonie@kernel•org>
To: "Thomas Hellström" <thomas.hellstrom@linux•intel.com>,
"DRM XE List" <intel-xe@lists•freedesktop.org>
Cc: Dave Airlie <airlied@redhat•com>,
Joel Fernandes <joelagnelf@nvidia•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Matthew Auld <matthew.auld@intel•com>,
Sanjay Yadav <sanjay.kumar.yadav@intel•com>
Subject: linux-next: manual merge of the drm-xe tree with the drm-misc tree
Date: Mon, 23 Feb 2026 13:35:14 +0000 [thread overview]
Message-ID: <aZxXktNIJQ192N4a@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2082 bytes --]
Hi all,
Today's linux-next merge of the drm-xe tree got a conflict in:
drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
between commit:
ba110db8e1bc2 ("gpu: Move DRM buddy allocator one level up (part two)")
from the drm-misc tree and commit:
dc2fc00ba94de ("drm/xe: Use DRM_BUDDY_CONTIGUOUS_ALLOCATION for contiguous allocations")
from the drm-xe 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.
diff --cc drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
index 2c44aa4b5562b,d6aa61e55f4d7..0000000000000
--- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
+++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c
@@@ -80,10 -79,13 +80,13 @@@ static int xe_ttm_vram_mgr_new(struct t
INIT_LIST_HEAD(&vres->blocks);
if (place->flags & TTM_PL_FLAG_TOPDOWN)
- vres->flags |= DRM_BUDDY_TOPDOWN_ALLOCATION;
+ vres->flags |= GPU_BUDDY_TOPDOWN_ALLOCATION;
+ if (place->flags & TTM_PL_FLAG_CONTIGUOUS)
+ vres->flags |= DRM_BUDDY_CONTIGUOUS_ALLOCATION;
+
if (place->fpfn || lpfn != man->size >> PAGE_SHIFT)
- vres->flags |= DRM_BUDDY_RANGE_ALLOCATION;
+ vres->flags |= GPU_BUDDY_RANGE_ALLOCATION;
if (WARN_ON(!vres->base.size)) {
err = -EINVAL;
@@@ -111,15 -113,7 +114,7 @@@
goto error_unlock;
}
- if (place->fpfn + (size >> PAGE_SHIFT) != lpfn &&
- place->flags & TTM_PL_FLAG_CONTIGUOUS) {
- size = roundup_pow_of_two(size);
- min_page_size = size;
-
- lpfn = max_t(unsigned long, place->fpfn + (size >> PAGE_SHIFT), lpfn);
- }
-
- err = drm_buddy_alloc_blocks(mm, (u64)place->fpfn << PAGE_SHIFT,
+ err = gpu_buddy_alloc_blocks(mm, (u64)place->fpfn << PAGE_SHIFT,
(u64)lpfn << PAGE_SHIFT, size,
min_page_size, &vres->blocks, vres->flags);
if (err)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-02-23 13:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-23 13:35 Mark Brown [this message]
2026-02-23 13:40 ` linux-next: manual merge of the drm-xe tree with the drm-misc tree Joel Fernandes
-- strict thread matches above, loose matches on Subject: below --
2024-08-01 1:26 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aZxXktNIJQ192N4a@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=airlied@redhat$(echo .)com \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=joelagnelf@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matthew.auld@intel$(echo .)com \
--cc=sanjay.kumar.yadav@intel$(echo .)com \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox