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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Alex Deucher <alexander.deucher@amd.com>,
	Dave Airlie <airlied@redhat.com>,
	Deepak R Varma <mh12gx2825@gmail.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Tue, 3 Nov 2020 14:10:21 +1100	[thread overview]
Message-ID: <20201103141021.2ee64034@canb.auug.org.au> (raw)

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

Hi all,

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

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

between commit:

  0a667b500703 ("drm/ttm: remove bdev from ttm_tt")

from Linus' tree and commit:

  c4c5ae67d179 ("drm/amdgpu/amdgpu: use "*" adjacent to data name")

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_ttm.c
index 8039d2399584,69ebd07f3eee..000000000000

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -63,16 -63,13 +63,16 @@@
  
  #define AMDGPU_TTM_VRAM_MAX_DW_READ	(size_t)128
  
 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,
 +				   struct ttm_tt *ttm,
 +				   struct ttm_resource *bo_mem);
 +
  static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
  				    unsigned int type,
- 				    uint64_t size)
+ 				    uint64_t size_in_page)
  {
  	return ttm_range_man_init(&adev->mman.bdev, type,
- 				  false, size >> PAGE_SHIFT);
 -				  TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,
+ 				  false, size_in_page);
  }
  
  /**
@@@ -1107,12 -1111,11 +1107,12 @@@ gart_bind_fail
   * Called by ttm_tt_bind() on behalf of ttm_bo_handle_move_mem().
   * This handles binding GTT memory to the device address space.
   */
 -static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm,
 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,
 +				   struct ttm_tt *ttm,
  				   struct ttm_resource *bo_mem)
  {
 -	struct amdgpu_device *adev = amdgpu_ttm_adev(ttm->bdev);
 +	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
- 	struct amdgpu_ttm_tt *gtt = (void*)ttm;
+ 	struct amdgpu_ttm_tt *gtt = (void *)ttm;
  	uint64_t flags;
  	int r = 0;
  

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