[PATCH 20/28] drm/amdgpu: init vmhubs bitmask for GC 9.4.3

[Alex Deucher]

From: Le Ma <le...@amd.com>

Each XCD owns one GFXHUB.

v2: switch to the new VMHUB layout

Signed-off-by: Le Ma <le...@amd.com>
Acked-by: Christian König <christian.koe...@amd.com>
Reviewed-by: Hawking Zhang <hawking.zh...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c 
b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index ce9ae3a5a9c5..63ea9dabe999 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1684,7 +1684,6 @@ static int gmc_v9_0_sw_init(void *handle)
        case IP_VERSION(9, 4, 0):
        case IP_VERSION(9, 3, 0):
        case IP_VERSION(9, 4, 2):
-       case IP_VERSION(9, 4, 3):
                set_bit(AMDGPU_GFXHUB(0), adev->vmhubs_mask);
                set_bit(AMDGPU_MMHUB0(0), adev->vmhubs_mask);
 
@@ -1710,6 +1709,12 @@ static int gmc_v9_0_sw_init(void *handle)
                amdgpu_vm_adjust_size(adev, 256 * 1024, 9, 3, 48);
                adev->gmc.translate_further = adev->vm_manager.num_level > 1;
                break;
+       case IP_VERSION(9, 4, 3):
+               bitmap_set(adev->vmhubs_mask, AMDGPU_GFXHUB(0), 
adev->gfx.num_xcd);
+               bitmap_set(adev->vmhubs_mask, AMDGPU_MMHUB0(0), 1);
+
+               amdgpu_vm_adjust_size(adev, 256 * 1024, 9, 3, 48);
+               break;
        default:
                break;
        }
-- 
2.39.2