AMD-GFX Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10
@ 2020-06-30  1:55 Joseph Greathouse
  2020-06-30 11:59 ` Russell, Kent
  0 siblings, 1 reply; 4+ messages in thread
From: Joseph Greathouse @ 2020-06-30  1:55 UTC (permalink / raw)
  To: amd-gfx; +Cc: Joseph Greathouse

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@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)
+		|| (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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10
  2020-06-30  1:55 [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10 Joseph Greathouse
@ 2020-06-30 11:59 ` Russell, Kent
  2020-06-30 13:30   ` Russell, Kent
  2020-06-30 13:34   ` Greathouse, Joseph
  0 siblings, 2 replies; 4+ messages in thread
From: Russell, Kent @ 2020-06-30 11:59 UTC (permalink / raw)
  To: Greathouse, Joseph, amd-gfx; +Cc: Greathouse, Joseph

[AMD Public Use]

One inquiry inline

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Joseph
> Greathouse
> Sent: Monday, June 29, 2020 9:55 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Greathouse, Joseph <Joseph.Greathouse@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@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@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr
> eedesktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&amp;data=02%7C01%7Ckent.russell%40amd.com%7C763e1f08fe29488bf1
> 6c08d81c98b2c5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C63
> 7290790080559728&amp;sdata=22Hd8tIxsjF%2BLXiBKQgSt6EbOTIHqifVSYMb
> W1AWxV4%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10
  2020-06-30 11:59 ` Russell, Kent
@ 2020-06-30 13:30   ` Russell, Kent
  2020-06-30 13:34   ` Greathouse, Joseph
  1 sibling, 0 replies; 4+ messages in thread
From: Russell, Kent @ 2020-06-30 13:30 UTC (permalink / raw)
  To: Russell, Kent, Greathouse, Joseph, amd-gfx; +Cc: Greathouse, Joseph

[AMD Public Use]

Thanks for answering my question offline. Patch is
Reviewed-by: Kent Russell <kent.russell@amd.com>

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Russell,
> Kent
> Sent: Tuesday, June 30, 2020 8:00 AM
> To: Greathouse, Joseph <Joseph.Greathouse@amd.com>; amd-
> gfx@lists.freedesktop.org
> Cc: Greathouse, Joseph <Joseph.Greathouse@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@lists.freedesktop.org> On Behalf Of
> > Joseph Greathouse
> > Sent: Monday, June 29, 2020 9:55 PM
> > To: amd-gfx@lists.freedesktop.org
> > Cc: Greathouse, Joseph <Joseph.Greathouse@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@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@lists.freedesktop.org
> > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
> > s.fr
> > eedesktop.org%2Fmailman%2Flistinfo%2Famd-
> >
> gfx&amp;data=02%7C01%7Ckent.russell%40amd.com%7C763e1f08fe29488bf1
> >
> 6c08d81c98b2c5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C63
> >
> 7290790080559728&amp;sdata=22Hd8tIxsjF%2BLXiBKQgSt6EbOTIHqifVSYMb
> > W1AWxV4%3D&amp;reserved=0
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fr
> eedesktop.org%2Fmailman%2Flistinfo%2Famd-
> gfx&amp;data=02%7C01%7Ckent.russell%40amd.com%7Ca4e3323d9bcc417be
> 40808d81ced2013%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C6
> 37291152507197101&amp;sdata=zrfmEq3xf5Y2MoFGnBK8EP5eYqZmWXPm3y
> KlrEtcMdU%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* RE: [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10
  2020-06-30 11:59 ` Russell, Kent
  2020-06-30 13:30   ` Russell, Kent
@ 2020-06-30 13:34   ` Greathouse, Joseph
  1 sibling, 0 replies; 4+ messages in thread
From: Greathouse, Joseph @ 2020-06-30 13:34 UTC (permalink / raw)
  To: Russell, Kent, amd-gfx

[AMD Public Use]

Response inline.

Thanks,
-Joe

-----Original Message-----
From: Russell, Kent <Kent.Russell@amd.com> 
Sent: Tuesday, June 30, 2020 7:00 AM
To: Greathouse, Joseph <Joseph.Greathouse@amd.com>; amd-gfx@lists.freedesktop.org
Cc: Greathouse, Joseph <Joseph.Greathouse@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@lists.freedesktop.org> On Behalf Of Joseph
> Greathouse
> Sent: Monday, June 29, 2020 9:55 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Greathouse, Joseph <Joseph.Greathouse@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@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);
> 
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-30  1:55 [PATCH] drm/amdkfd: Add Arcturus GWS support and fix VG10 Joseph Greathouse
2020-06-30 11:59 ` Russell, Kent
2020-06-30 13:30   ` Russell, Kent
2020-06-30 13:34   ` Greathouse, Joseph

AMD-GFX Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/amd-gfx/0 amd-gfx/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 amd-gfx amd-gfx/ https://lore.kernel.org/amd-gfx \
		amd-gfx@lists.freedesktop.org
	public-inbox-index amd-gfx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.amd-gfx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git