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

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

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

Hi all,

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

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

between commit:

  34e5a54327dc ("Revert "drm/amdgpu: remove TOPDOWN flags when allocating VRAM in large bar system"")

from Linus' tree and commit:

  7f6db89418f9 ("drm/amdgpu: dGPU mode placement support memory partition")

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/amd/amdgpu/amdgpu_object.c
index a70103ac0026,f76649e523a0..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@@ -139,8 -149,8 +149,8 @@@ void amdgpu_bo_placement_from_domain(st
  		places[c].flags = 0;
  
  		if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)
- 			places[c].lpfn = visible_pfn;
+ 			places[c].lpfn = min_not_zero(places[c].lpfn, visible_pfn);
 -		else if (adev->gmc.real_vram_size != adev->gmc.visible_vram_size)
 +		else
  			places[c].flags |= TTM_PL_FLAG_TOPDOWN;
  
  		if (flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)

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