public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: manual merge of the drm-xe tree with the drm-misc tree
@ 2026-02-23 13:35 Mark Brown
  2026-02-23 13:40 ` Joel Fernandes
  0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2026-02-23 13:35 UTC (permalink / raw)
  To: Thomas Hellström, DRM XE List
  Cc: Dave Airlie, Joel Fernandes, Linux Kernel Mailing List,
	Linux Next Mailing List, Matthew Auld, Sanjay Yadav

[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread
* linux-next: manual merge of the drm-xe tree with the drm-misc tree
@ 2024-08-01  1:26 Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-08-01  1:26 UTC (permalink / raw)
  To: Lucas De Marchi, Thomas Hellström, Daniel Vetter
  Cc: Intel Graphics, DRI, DRM XE List, Christian König,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Umesh Nerlige Ramappa

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

Hi all,

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

  drivers/gpu/drm/xe/xe_vm.c

between commit:

  4c44f89c5dae ("drm/ttm, drm/amdgpu, drm/xe: Consider hitch moves within bulk sublist moves")

from the drm-misc tree and commit:

  a2387e69493d ("drm/xe: Take a ref to xe file when user creates a VM")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/xe/xe_vm.c
index c3bdb6362fe9,f225107bdd65..000000000000
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@@ -1604,7 -1670,10 +1673,11 @@@ static void vm_destroy_work_func(struc
  		XE_WARN_ON(vm->pt_root[id]);
  
  	trace_xe_vm_free(vm);
 +	ttm_lru_bulk_move_fini(&xe->ttm, &vm->lru_bulk_move);
+ 
+ 	if (vm->xef)
+ 		xe_file_put(vm->xef);
+ 
  	kfree(vm);
  }
  

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-02-23 13:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-23 13:35 linux-next: manual merge of the drm-xe tree with the drm-misc tree Mark Brown
2026-02-23 13:40 ` Joel Fernandes
  -- strict thread matches above, loose matches on Subject: below --
2024-08-01  1:26 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox