Commit 7c4f4f19 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amdkfd: Add GC 10.3.6 and 10.3.7 KFD definitions 



Loading amdgpu on GC 10.3.7 shows an ERR level message:
`kfd kfd: amdgpu: GC IP 0a0307 not supported in kfd`

Add these targets to match yellow carp structures.

Reported-by: default avatarDavid Chang <david.chang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Tested-by: default avatarJesse(Jie) Zhang <Jesse.Zhang@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.18.x
parent fa582c6f

drivers/gpu/drm/amd/amdkfd/kfd_crat.c

+2 −0
Original line number Diff line number Diff line
@@ -1516,6 +1516,8 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev, 
			num_of_cache_types = ARRAY_SIZE(beige_goby_cache_info);

			break;

		case IP_VERSION(10, 3, 3):

		case IP_VERSION(10, 3, 6): /* TODO: Double check these on production silicon */

		case IP_VERSION(10, 3, 7): /* TODO: Double check these on production silicon */

			pcache_info = yellow_carp_cache_info;

			num_of_cache_types = ARRAY_SIZE(yellow_carp_cache_info);

			break;

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+14 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd) 
	case IP_VERSION(4, 1, 2):/* RENOIR */

	case IP_VERSION(5, 2, 1):/* VANGOGH */

	case IP_VERSION(5, 2, 3):/* YELLOW_CARP */

	case IP_VERSION(5, 2, 6):/* GC 10.3.6 */

	case IP_VERSION(5, 2, 7):/* GC 10.3.7 */

	case IP_VERSION(6, 0, 1):

		kfd->device_info.num_sdma_queues_per_engine = 2;

		break;
@@ -127,6 +129,8 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd) 
	case IP_VERSION(9, 4, 2): /* ALDEBARAN */

	case IP_VERSION(10, 3, 1): /* VANGOGH */

	case IP_VERSION(10, 3, 3): /* YELLOW_CARP */

	case IP_VERSION(10, 3, 6): /* GC 10.3.6 */

	case IP_VERSION(10, 3, 7): /* GC 10.3.7 */

	case IP_VERSION(10, 1, 3): /* CYAN_SKILLFISH */

	case IP_VERSION(10, 1, 4):

	case IP_VERSION(10, 1, 10): /* NAVI10 */
@@ -368,6 +372,16 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf) 
			if (!vf)

				f2g = &gfx_v10_3_kfd2kgd;

			break;

		case IP_VERSION(10, 3, 6):

			gfx_target_version = 100306;

			if (!vf)

				f2g = &gfx_v10_3_kfd2kgd;

			break;

		case IP_VERSION(10, 3, 7):

			gfx_target_version = 100307;

			if (!vf)

				f2g = &gfx_v10_3_kfd2kgd;

			break;

		case IP_VERSION(11, 0, 0):

			gfx_target_version = 110000;

			f2g = &gfx_v11_kfd2kgd;