[PATCH] drm/amdgpu: disable default navi2x co-op kernel support

[Felix Kuehling]

On 2021-12-09 10:20 p.m., Jonathan Kim wrote:
> This patch reverts the following:
> 'commit fc547b2b1816 ("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 <jonathan.kim at amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 67dd94b0b9a7..facc28f58c1f 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);
>