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

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

[Stephen Rothwell]

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

Hi all,

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

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

between commits:

  b453e42a6e8b ("drm/amdgpu: Add new placement for preemptible SG BOs")
  19a1d9350be6 ("drm/amdgpu: flush gart changes after all BO recovery")

from the drm and amdgpu trees and commits:

  d3116756a710 ("drm/ttm: rename bo->mem and make it a pointer")
  bfa3357ef9ab ("drm/ttm: allocate resource object instead of embedding it v2")

from the drm-misc 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 832970cff64c,53a8ab8ce2a7..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -460,11 -460,10 +462,11 @@@ static int amdgpu_bo_move(struct ttm_bu
  {
  	struct amdgpu_device *adev;
  	struct amdgpu_bo *abo;
- 	struct ttm_resource *old_mem = &bo->mem;
+ 	struct ttm_resource *old_mem = bo->resource;
  	int r;
  
 -	if (new_mem->mem_type == TTM_PL_TT) {
 +	if (new_mem->mem_type == TTM_PL_TT ||
 +	    new_mem->mem_type == AMDGPU_PL_PREEMPT) {
  		r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, new_mem);
  		if (r)
  			return r;
@@@ -965,39 -962,38 +968,39 @@@ int amdgpu_ttm_alloc_gart(struct ttm_bu
  
  	addr = amdgpu_gmc_agp_addr(bo);
  	if (addr != AMDGPU_BO_INVALID_OFFSET) {
- 		bo->mem.start = addr >> PAGE_SHIFT;
- 	} else {
- 
- 		/* allocate GART space */
- 		placement.num_placement = 1;
- 		placement.placement = &placements;
- 		placement.num_busy_placement = 1;
- 		placement.busy_placement = &placements;
- 		placements.fpfn = 0;
- 		placements.lpfn = adev->gmc.gart_size >> PAGE_SHIFT;
- 		placements.mem_type = TTM_PL_TT;
- 		placements.flags = bo->mem.placement;
- 
- 		r = ttm_bo_mem_space(bo, &placement, &tmp, &ctx);
- 		if (unlikely(r))
- 			return r;
+ 		bo->resource->start = addr >> PAGE_SHIFT;
+ 		return 0;
+ 	}
  
- 		/* compute PTE flags for this buffer object */
- 		flags = amdgpu_ttm_tt_pte_flags(adev, bo->ttm, &tmp);
+ 	/* allocate GART space */
+ 	placement.num_placement = 1;
+ 	placement.placement = &placements;
+ 	placement.num_busy_placement = 1;
+ 	placement.busy_placement = &placements;
+ 	placements.fpfn = 0;
+ 	placements.lpfn = adev->gmc.gart_size >> PAGE_SHIFT;
+ 	placements.mem_type = TTM_PL_TT;
+ 	placements.flags = bo->resource->placement;
+ 
+ 	r = ttm_bo_mem_space(bo, &placement, &tmp, &ctx);
+ 	if (unlikely(r))
+ 		return r;
  
- 		/* Bind pages */
- 		gtt->offset = (u64)tmp.start << PAGE_SHIFT;
- 		r = amdgpu_ttm_gart_bind(adev, bo, flags);
- 		if (unlikely(r)) {
- 			ttm_resource_free(bo, &tmp);
- 			return r;
- 		}
+ 	/* compute PTE flags for this buffer object */
+ 	flags = amdgpu_ttm_tt_pte_flags(adev, bo->ttm, tmp);
  
- 		amdgpu_gart_invalidate_tlb(adev);
- 		ttm_resource_free(bo, &bo->mem);
- 		bo->mem = tmp;
+ 	/* Bind pages */
+ 	gtt->offset = (u64)tmp->start << PAGE_SHIFT;
+ 	r = amdgpu_ttm_gart_bind(adev, bo, flags);
+ 	if (unlikely(r)) {
+ 		ttm_resource_free(bo, &tmp);
+ 		return r;
  	}
  
++	amdgpu_gart_invalidate_tlb(adev);
+ 	ttm_resource_free(bo, &bo->resource);
+ 	ttm_bo_assign_mem(bo, tmp);
+ 
  	return 0;
  }
  
@@@ -1354,16 -1349,7 +1357,16 @@@ static bool amdgpu_ttm_bo_eviction_valu
  		}
  	}
  
- 	switch (bo->mem.mem_type) {
+ 	switch (bo->resource->mem_type) {
 +	case AMDGPU_PL_PREEMPT:
 +		/* Preemptible BOs don't own system resources managed by the
 +		 * driver (pages, VRAM, GART space). They point to resources
 +		 * owned by someone else (e.g. pageable memory in user mode
 +		 * or a DMABuf). They are used in a preemptible context so we
 +		 * can guarantee no deadlocks and good QoS in case of MMU
 +		 * notifiers or DMABuf move notifiers from the resource owner.
 +		 */
 +		return false;
  	case TTM_PL_TT:
  		if (amdgpu_bo_is_amdgpu_bo(bo) &&
  		    amdgpu_bo_encrypted(ttm_to_amdgpu_bo(bo)))
@@@ -1942,12 -1920,7 +1945,12 @@@ int amdgpu_fill_buffer(struct amdgpu_b
  		return -EINVAL;
  	}
  
- 	if (bo->tbo.mem.mem_type == AMDGPU_PL_PREEMPT) {
++	if (bo->tbo.resource->mem_type == AMDGPU_PL_PREEMPT) {
 +		DRM_ERROR("Trying to clear preemptible memory.\n");
 +		return -EINVAL;
 +	}
 +
- 	if (bo->tbo.mem.mem_type == TTM_PL_TT) {
+ 	if (bo->tbo.resource->mem_type == TTM_PL_TT) {
  		r = amdgpu_ttm_alloc_gart(&bo->tbo);
  		if (r)
  			return r;

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