Commit 0bf478f0 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu/mes: relocate status_fence slot allocation 



Move the status_fence slot allocation from ip specific function
to general mes function.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b04c1d64

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

+11 −0
Original line number Diff line number Diff line
@@ -176,6 +176,17 @@ int amdgpu_mes_init(struct amdgpu_device *adev) 
	adev->mes.sch_ctx_ptr =

		(uint64_t *)&adev->wb.wb[adev->mes.sch_ctx_offs];



	r = amdgpu_device_wb_get(adev, &adev->mes.query_status_fence_offs);

	if (r) {

		dev_err(adev->dev,

			"(%d) query_status_fence_offs wb alloc failed\n", r);

		return r;

	}

	adev->mes.query_status_fence_gpu_addr =

		adev->wb.gpu_addr + (adev->mes.query_status_fence_offs * 4);

	adev->mes.query_status_fence_ptr =

		(uint64_t *)&adev->wb.wb[adev->mes.query_status_fence_offs];



	r = amdgpu_mes_doorbell_init(adev);

	if (r)

		goto error;

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

+0 −33
Original line number Diff line number Diff line
@@ -606,35 +606,6 @@ static int mes_v10_1_allocate_eop_buf(struct amdgpu_device *adev, 
	return 0;

}



static int mes_v10_1_allocate_mem_slots(struct amdgpu_device *adev)

{

	int r;



	r = amdgpu_device_wb_get(adev, &adev->mes.sch_ctx_offs);

	if (r) {

		dev_err(adev->dev,

			"(%d) mes sch_ctx_offs wb alloc failed\n", r);

		return r;

	}

	adev->mes.sch_ctx_gpu_addr =

		adev->wb.gpu_addr + (adev->mes.sch_ctx_offs * 4);

	adev->mes.sch_ctx_ptr =

		(uint64_t *)&adev->wb.wb[adev->mes.sch_ctx_offs];



	r = amdgpu_device_wb_get(adev, &adev->mes.query_status_fence_offs);

	if (r) {

		dev_err(adev->dev,

			"(%d) query_status_fence_offs wb alloc failed\n", r);

		return r;

	}

	adev->mes.query_status_fence_gpu_addr =

		adev->wb.gpu_addr + (adev->mes.query_status_fence_offs * 4);

	adev->mes.query_status_fence_ptr =

		(uint64_t *)&adev->wb.wb[adev->mes.query_status_fence_offs];



	return 0;

}



static int mes_v10_1_mqd_init(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;
@@ -991,10 +962,6 @@ static int mes_v10_1_sw_init(void *handle) 
	if (r)

		return r;



	r = mes_v10_1_allocate_mem_slots(adev);

	if (r)

		return r;



	return 0;

}