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: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index 90c4005..a988c23 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
index fecf3f2..d77242e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
@@ -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;
 }