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

[Russell, Kent]

[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?
> +		|| (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);
> 
> --
> 2.20.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr
> eedesktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&data=02%7C01%7Ckent.russell%40amd.com%7C763e1f08fe29488bf1
> 6c08d81c98b2c5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C63
> 7290790080559728&sdata=22Hd8tIxsjF%2BLXiBKQgSt6EbOTIHqifVSYMb
> W1AWxV4%3D&reserved=0