summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLe Ma <le.ma@amd.com>2021-12-20 16:42:20 +0800
committerAlex Deucher <alexander.deucher@amd.com>2023-06-09 09:40:20 -0400
commitce8a12a532ed62d7037be91c5714243fdfa9f672 (patch)
treea80d443e3238248f02b0358cd2a4044fd3e41368
parentd9426c3d9b4e91dda4f1f1684f9296762fafe0de (diff)
downloadlinux-stable-ce8a12a532ed62d7037be91c5714243fdfa9f672.tar.gz
linux-stable-ce8a12a532ed62d7037be91c5714243fdfa9f672.tar.bz2
linux-stable-ce8a12a532ed62d7037be91c5714243fdfa9f672.zip
drm/amdgpu: init vmhubs bitmask for GC 9.4.3
Each XCD owns one GFXHUB. v2: switch to the new VMHUB layout Signed-off-by: Le Ma <le.ma@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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index d4bfb5f8308a..6da85365e5aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1701,7 +1701,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);
@@ -1727,6 +1726,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;
}