Commit 7b7c6c81 authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: separate gpu address from bo pin 



It could be got by amdgpu_bo_gpu_offset() if need

Signed-off-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b861686b

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

+2 −4
Original line number Diff line number Diff line
@@ -251,7 +251,6 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
	struct amdgpu_bo *bo = NULL;

	struct amdgpu_bo_param bp;

	int r;

	uint64_t gpu_addr_tmp = 0;

	void *cpu_ptr_tmp = NULL;



	memset(&bp, 0, sizeof(bp));
@@ -275,8 +274,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
		goto allocate_mem_reserve_bo_failed;

	}



	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT,

				&gpu_addr_tmp);

	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	if (r) {

		dev_err(adev->dev, "(%d) failed to pin bo for amdkfd\n", r);

		goto allocate_mem_pin_bo_failed;
@@ -290,7 +288,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
	}



	*mem_obj = bo;

	*gpu_addr = gpu_addr_tmp;

	*gpu_addr = amdgpu_bo_gpu_offset(bo);

	*cpu_ptr = cpu_ptr_tmp;



	amdgpu_bo_unreserve(bo);

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

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct kgd_dev *kgd, 
		goto bo_reserve_failed;

	}



	ret = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT, NULL);

	ret = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	if (ret) {

		pr_err("Failed to pin bo. ret %d\n", ret);

		goto pin_failed;

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

+4 −2
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
	r = amdgpu_bo_reserve(sobj, false);

	if (unlikely(r != 0))

		goto out_cleanup;

	r = amdgpu_bo_pin(sobj, sdomain, &saddr);

	r = amdgpu_bo_pin(sobj, sdomain);

	saddr = amdgpu_bo_gpu_offset(sobj);

	amdgpu_bo_unreserve(sobj);

	if (r) {

		goto out_cleanup;
@@ -108,7 +109,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
	r = amdgpu_bo_reserve(dobj, false);

	if (unlikely(r != 0))

		goto out_cleanup;

	r = amdgpu_bo_pin(dobj, ddomain, &daddr);

	r = amdgpu_bo_pin(dobj, ddomain);

	daddr = amdgpu_bo_gpu_offset(dobj);

	amdgpu_bo_unreserve(dobj);

	if (r) {

		goto out_cleanup;

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

+2 −3
Original line number Diff line number Diff line
@@ -2758,11 +2758,10 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 
			struct amdgpu_bo *aobj = gem_to_amdgpu_bo(amdgpu_crtc->cursor_bo);

			r = amdgpu_bo_reserve(aobj, true);

			if (r == 0) {

				r = amdgpu_bo_pin(aobj,

						  AMDGPU_GEM_DOMAIN_VRAM,

						  &amdgpu_crtc->cursor_addr);

				r = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM);

				if (r != 0)

					DRM_ERROR("Failed to pin cursor BO (%d)\n", r);

				amdgpu_crtc->cursor_addr = amdgpu_bo_gpu_offset(aobj);

				amdgpu_bo_unreserve(aobj);

			}

		}

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

+2 −3
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	struct amdgpu_bo *new_abo;

	unsigned long flags;

	u64 tiling_flags;

	u64 base;

	int i, r;



	work = kzalloc(sizeof *work, GFP_KERNEL);
@@ -189,7 +188,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
		goto cleanup;

	}



	r = amdgpu_bo_pin(new_abo, amdgpu_display_supported_domains(adev), &base);

	r = amdgpu_bo_pin(new_abo, amdgpu_display_supported_domains(adev));

	if (unlikely(r != 0)) {

		DRM_ERROR("failed to pin new abo buffer before flip\n");

		goto unreserve;
@@ -206,7 +205,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	amdgpu_bo_get_tiling_flags(new_abo, &tiling_flags);

	amdgpu_bo_unreserve(new_abo);



	work->base = base;

	work->base = amdgpu_bo_gpu_offset(new_abo);

	work->target_vblank = target - (uint32_t)drm_crtc_vblank_count(crtc) +

		amdgpu_get_vblank_counter_kms(dev, work->crtc_id);