Commit 7cf609b9 authored by Le Ma's avatar Le Ma Committed by Alex Deucher

drm/amdgpu/mes: allocate memory slots for hw resource setting

Pass a piece of memory to MES ucode to fill contents.
Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ae4e3b62
...@@ -562,6 +562,35 @@ static int mes_v10_1_allocate_eop_buf(struct amdgpu_device *adev) ...@@ -562,6 +562,35 @@ static int mes_v10_1_allocate_eop_buf(struct amdgpu_device *adev)
return 0; 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) static int mes_v10_1_mqd_init(struct amdgpu_ring *ring)
{ {
struct amdgpu_device *adev = ring->adev; struct amdgpu_device *adev = ring->adev;
...@@ -876,6 +905,10 @@ static int mes_v10_1_sw_init(void *handle) ...@@ -876,6 +905,10 @@ static int mes_v10_1_sw_init(void *handle)
if (r) if (r)
return r; return r;
r = mes_v10_1_allocate_mem_slots(adev);
if (r)
return r;
return 0; return 0;
} }
...@@ -883,6 +916,9 @@ static int mes_v10_1_sw_fini(void *handle) ...@@ -883,6 +916,9 @@ static int mes_v10_1_sw_fini(void *handle)
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
amdgpu_device_wb_free(adev, adev->mes.sch_ctx_offs);
amdgpu_device_wb_free(adev, adev->mes.query_status_fence_offs);
kfree(adev->mes.mqd_backup); kfree(adev->mes.mqd_backup);
amdgpu_bo_free_kernel(&adev->mes.ring.mqd_obj, amdgpu_bo_free_kernel(&adev->mes.ring.mqd_obj,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment