From: Graham Sider Date: Thu, 9 Dec 2021 18:26:05 +0000 (-0500) Subject: drm/amdkfd: add Navi2x to GWS init conditions X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=48733b224fa7ba32de9e9a1a8ddc8eedcd603919;p=linux.git drm/amdkfd: add Navi2x to GWS init conditions Initalize GWS on Navi2x with mec2_fw_version >= 0x42. Signed-off-by: Graham Sider Reviewed-and-tested-by: Jonathan Kim Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index facc28f58c1f0..67dd94b0b9a71 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -368,7 +368,10 @@ static int kfd_gws_init(struct kfd_dev *kfd) (KFD_GC_VERSION(kfd) == IP_VERSION(9, 4, 1) && kfd->mec2_fw_version >= 0x30) || (KFD_GC_VERSION(kfd) == IP_VERSION(9, 4, 2) - && kfd->mec2_fw_version >= 0x28)))) + && kfd->mec2_fw_version >= 0x28) || + (KFD_GC_VERSION(kfd) >= IP_VERSION(10, 3, 0) + && KFD_GC_VERSION(kfd) <= IP_VERSION(10, 3, 5) + && kfd->mec2_fw_version >= 0x42)))) ret = amdgpu_amdkfd_alloc_gws(kfd->adev, kfd->adev->gds.gws_size, &kfd->gws);