linux-next: manual merge of the amdgpu tree with the drm-misc tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

between commit:

  c777dc9e7933 ("drm/ttm: move the page_alignment into the BO v2")

from the drm-misc tree and commit:

  dd03daec0ff1 ("drm/amdgpu: restructure amdgpu_vram_mgr_new")

from the amdgpu 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/amd/amdgpu/amdgpu_vram_mgr.c
index f7235438535f,e2cbe19404c0..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@@ -448,10 -391,10 +391,10 @@@ static int amdgpu_vram_mgr_new(struct t
  		pages_per_node = HPAGE_PMD_NR;
  #else
  		/* default to 2MB */
- 		pages_per_node = (2UL << (20UL - PAGE_SHIFT));
+ 		pages_per_node = 2UL << (20UL - PAGE_SHIFT);
  #endif
- 		pages_per_node = max((uint32_t)pages_per_node,
- 				     tbo->page_alignment);
+ 		pages_per_node = max_t(uint32_t, pages_per_node,
 -				       mem->page_alignment);
++				       tbo->page_alignment);
  		num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);
  	}
  
@@@ -469,38 -412,29 +412,29 @@@
  	mem->start = 0;
  	pages_left = mem->num_pages;
  
- 	spin_lock(&mgr->lock);
- 	for (i = 0; pages_left >= pages_per_node; ++i) {
- 		unsigned long pages = rounddown_pow_of_two(pages_left);
+ 	/* Limit maximum size to 2GB due to SG table limitations */
+ 	pages = min(pages_left, 2UL << (30 - PAGE_SHIFT));
  
- 		/* Limit maximum size to 2GB due to SG table limitations */
- 		pages = min(pages, (2UL << (30 - PAGE_SHIFT)));
- 
- 		r = drm_mm_insert_node_in_range(mm, &nodes[i], pages,
- 						pages_per_node, 0,
- 						place->fpfn, lpfn,
- 						mode);
- 		if (unlikely(r))
- 			break;
- 
- 		vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
- 		amdgpu_vram_mgr_virt_start(mem, &nodes[i]);
- 		pages_left -= pages;
- 	}
- 
- 	for (; pages_left; ++i) {
- 		unsigned long pages = min(pages_left, pages_per_node);
+ 	i = 0;
+ 	spin_lock(&mgr->lock);
+ 	while (pages_left) {
 -		uint32_t alignment = mem->page_alignment;
 +		uint32_t alignment = tbo->page_alignment;
  
- 		if (pages == pages_per_node)
+ 		if (pages >= pages_per_node)
  			alignment = pages_per_node;
  
- 		r = drm_mm_insert_node_in_range(mm, &nodes[i],
- 						pages, alignment, 0,
- 						place->fpfn, lpfn,
- 						mode);
- 		if (unlikely(r))
+ 		r = drm_mm_insert_node_in_range(mm, &nodes[i], pages, alignment,
+ 						0, place->fpfn, lpfn, mode);
+ 		if (unlikely(r)) {
+ 			if (pages > pages_per_node) {
+ 				if (is_power_of_2(pages))
+ 					pages = pages / 2;
+ 				else
+ 					pages = rounddown_pow_of_two(pages);
+ 				continue;
+ 			}
  			goto error;
+ 		}
  
  		vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
  		amdgpu_vram_mgr_virt_start(mem, &nodes[i]);

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