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

[Stephen Rothwell]

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:

  f5a89a5cae81 ("drm/amdgpu/ttm: use multihop")

from the drm tree and commit:

  75501872b4af ("drm/amd/amdgpu/amdgpu_ttm: Demote non-conformant kernel-doc headers, fix slightly lacking ones")

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 676fb520e044,761dd68d7ced..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -512,7 -512,120 +512,7 @@@ error
  	return r;
  }
  
 -/**
 - * amdgpu_move_vram_ram - Copy VRAM buffer to RAM buffer
 - *
 - * Called by amdgpu_bo_move().
 - */
 -static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
 -				struct ttm_operation_ctx *ctx,
 -				struct ttm_resource *new_mem)
 -{
 -	struct ttm_resource *old_mem = &bo->mem;
 -	struct ttm_resource tmp_mem;
 -	struct ttm_place placements;
 -	struct ttm_placement placement;
 -	int r;
 -
 -	/* create space/pages for new_mem in GTT space */
 -	tmp_mem = *new_mem;
 -	tmp_mem.mm_node = NULL;
 -	placement.num_placement = 1;
 -	placement.placement = &placements;
 -	placement.num_busy_placement = 1;
 -	placement.busy_placement = &placements;
 -	placements.fpfn = 0;
 -	placements.lpfn = 0;
 -	placements.mem_type = TTM_PL_TT;
 -	placements.flags = 0;
 -	r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
 -	if (unlikely(r)) {
 -		pr_err("Failed to find GTT space for blit from VRAM\n");
 -		return r;
 -	}
 -
 -	r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 -	if (unlikely(r))
 -		goto out_cleanup;
 -
 -	/* Bind the memory to the GTT space */
 -	r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -
 -	/* blit VRAM to GTT */
 -	r = amdgpu_move_blit(bo, evict, &tmp_mem, old_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -
 -	r = ttm_bo_wait_ctx(bo, ctx);
 -	if (unlikely(r))
 -		goto out_cleanup;
 -
 -	amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm);
 -	ttm_resource_free(bo, &bo->mem);
 -	ttm_bo_assign_mem(bo, new_mem);
 -out_cleanup:
 -	ttm_resource_free(bo, &tmp_mem);
 -	return r;
 -}
 -
--/**
 - * amdgpu_move_ram_vram - Copy buffer from RAM to VRAM
 - *
 - * Called by amdgpu_bo_move().
 - */
 -static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
 -				struct ttm_operation_ctx *ctx,
 -				struct ttm_resource *new_mem)
 -{
 -	struct ttm_resource *old_mem = &bo->mem;
 -	struct ttm_resource tmp_mem;
 -	struct ttm_placement placement;
 -	struct ttm_place placements;
 -	int r;
 -
 -	/* make space in GTT for old_mem buffer */
 -	tmp_mem = *new_mem;
 -	tmp_mem.mm_node = NULL;
 -	placement.num_placement = 1;
 -	placement.placement = &placements;
 -	placement.num_busy_placement = 1;
 -	placement.busy_placement = &placements;
 -	placements.fpfn = 0;
 -	placements.lpfn = 0;
 -	placements.mem_type = TTM_PL_TT;
 -	placements.flags = 0;
 -	r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
 -	if (unlikely(r)) {
 -		pr_err("Failed to find GTT space for blit to VRAM\n");
 -		return r;
 -	}
 -
 -	/* move/bind old memory to GTT space */
 -	r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 -	if (unlikely(r))
 -		return r;
 -
 -	r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -
 -	ttm_bo_assign_mem(bo, &tmp_mem);
 -	/* copy to VRAM */
 -	r = amdgpu_move_blit(bo, evict, new_mem, old_mem);
 -	if (unlikely(r)) {
 -		goto out_cleanup;
 -	}
 -out_cleanup:
 -	ttm_resource_free(bo, &tmp_mem);
 -	return r;
 -}
 -
+ /*
   * amdgpu_mem_visible - Check that memory can be accessed by ttm_bo_move_memcpy
   *
   * Called by amdgpu_bo_move()

Attachment: pgpj8iROHcZxO.pgp
Description: OpenPGP digital signature