[PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10

[Greathouse, Joseph]

[AMD Public Use]

Response inline.

Thanks,
-Joe

-----Original Message-----
From: Russell, Kent <Kent.Russell at amd.com> 
Sent: Tuesday, June 30, 2020 7:00 AM
To: Greathouse, Joseph <Joseph.Greathouse at amd.com>; amd-gfx at lists.freedesktop.org
Cc: Greathouse, Joseph <Joseph.Greathouse at amd.com>
Subject: RE: [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10

[AMD Public Use]

One inquiry inline

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Joseph
> Greathouse
> Sent: Monday, June 29, 2020 9:55 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Greathouse, Joseph <Joseph.Greathouse at amd.com>
> Subject: [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10
> 
> Add support for GWS in Arcturus, which needs MEC2 firmware #48 or above.
> Fix the MEC2 version check for Vega 10 GWS support, since Vega 10 firmware
> adds 0x8000 to the actual firmware revision. We were previously declaring
> support where it did not exist.
> 
> Signed-off-by: Joseph Greathouse <Joseph.Greathouse at amd.com>
> Change-Id: I9b44dfe59bdd8a38a0342e5155cdb071cf646cc5
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index 80393e0583bb..50886de3ba0a 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -602,9 +602,13 @@ static int kfd_gws_init(struct kfd_dev *kfd)
>  		return 0;
> 
>  	if (hws_gws_support
> -		|| (kfd->device_info->asic_family >= CHIP_VEGA10
> +		|| (kfd->device_info->asic_family == CHIP_VEGA10
> +			&& kfd->mec2_fw_version >= 0x81b3)
> +		|| (kfd->device_info->asic_family >= CHIP_VEGA12
>  			&& kfd->device_info->asic_family <= CHIP_RAVEN
> -			&& kfd->mec2_fw_version >= 0x1b3))
> +			&& kfd->mec2_fw_version >= 0x1b3)
[KR] Is it 0x1b3 for both VG12 and RV? I wasn't sure if it was 0x1b4 for VG12, or did they just update the FW again and I missed the original?
[JLG] Yes, the base firmware version for all of these chips added support in 0x1b3. I don't believe AMD released 0x1b3 for some of these chips (e.g. Raven) due to some performance regressions on those chips that were then fixed in 0x1b4. However, if someone happens to have 0x1b3 on their system, GWS will work according to my tests.
> +		|| (kfd->device_info->asic_family == CHIP_ARCTURUS
> +			&& kfd->mec2_fw_version >= 0x30))
>  		ret = amdgpu_amdkfd_alloc_gws(kfd->kgd,
>  				amdgpu_amdkfd_get_num_gws(kfd->kgd),
> &kfd->gws);
>