From: Jonathan Kim Date: Fri, 10 Dec 2021 03:01:22 +0000 (-0500) Subject: drm/amdgpu: disable default navi2x co-op kernel support X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=addaac0cf75dbccf5c33a5c03d6b22a6bbdf9952;p=linux.git drm/amdgpu: disable default navi2x co-op kernel support This patch reverts the following: commit 48733b224fa7ba ("drm/amdkfd: add Navi2x to GWS init conditions") Disable GWS usage in default settings for now due to FW bugs. Signed-off-by: Jonathan Kim Reviewed-by: Felix Kuehling 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 67dd94b0b9a71..facc28f58c1f0 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -368,10 +368,7 @@ 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_GC_VERSION(kfd) >= IP_VERSION(10, 3, 0) - && KFD_GC_VERSION(kfd) <= IP_VERSION(10, 3, 5) - && kfd->mec2_fw_version >= 0x42)))) + && kfd->mec2_fw_version >= 0x28)))) ret = amdgpu_amdkfd_alloc_gws(kfd->adev, kfd->adev->gds.gws_size, &kfd->gws);