drm/amdgpu: assign different AMDGPU_GFXHUB for rings on each xcc

Pass the xcc_id to AMDGPU_GFXHUB(x)

Signed-off-by: Le Ma <le.ma@amd.com>
Reviewed-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_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 488b3bb..e5ff0bf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -315,7 +315,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev,
        ring->use_doorbell = true;
        ring->doorbell_index = adev->doorbell_index.kiq;
        ring->xcc_id = xcc_id;
-       ring->vm_hub = AMDGPU_GFXHUB(0);
+       ring->vm_hub = AMDGPU_GFXHUB(xcc_id);
        if (xcc_id >= 1)
                ring->doorbell_index = adev->doorbell_index.xcc1_kiq_start +
                                        xcc_id - 1;

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index f5104b9..064cd02 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -757,7 +757,7 @@ static int gfx_v9_4_3_compute_ring_init(struct amdgpu_device *adev, int ring_id,
                                (adev->doorbell_index.mec_ring0 + ring_id) << 1;
        ring->eop_gpu_addr = adev->gfx.mec.hpd_eop_gpu_addr
                                + (ring_id * GFX9_MEC_HPD_SIZE);
-       ring->vm_hub = AMDGPU_GFXHUB(0);
+       ring->vm_hub = AMDGPU_GFXHUB(xcc_id);
        sprintf(ring->name, "comp_%d.%d.%d.%d",
                        ring->xcc_id, ring->me, ring->pipe, ring->queue);