Commit b2e5a041 authored by Tim Huang's avatar Tim Huang Committed by Alex Deucher
Browse files

drm/amdgpu: add support for SDMA IP version 6.1.3 



This initializes SDMA IP version 6.1.3.

Signed-off-by: default avatarTim Huang <tim.huang@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b784faeb

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

+1 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(6, 1, 0):

	case IP_VERSION(6, 1, 1):

	case IP_VERSION(6, 1, 2):

	case IP_VERSION(6, 1, 3):

		amdgpu_device_ip_block_add(adev, &sdma_v6_0_ip_block);

		break;

	case IP_VERSION(7, 0, 0):

drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ MODULE_FIRMWARE("amdgpu/sdma_6_0_3.bin"); 
MODULE_FIRMWARE("amdgpu/sdma_6_1_0.bin");

MODULE_FIRMWARE("amdgpu/sdma_6_1_1.bin");

MODULE_FIRMWARE("amdgpu/sdma_6_1_2.bin");

MODULE_FIRMWARE("amdgpu/sdma_6_1_3.bin");



#define SDMA1_REG_OFFSET 0x600

#define SDMA0_HYP_DEC_REG_START 0x5880

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

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd) 
	case IP_VERSION(6, 1, 0):

	case IP_VERSION(6, 1, 1):

	case IP_VERSION(6, 1, 2):

	case IP_VERSION(6, 1, 3):

	case IP_VERSION(7, 0, 0):

	case IP_VERSION(7, 0, 1):

		kfd->device_info.num_sdma_queues_per_engine = 8;
@@ -122,6 +123,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd) 
	case IP_VERSION(6, 1, 0):

	case IP_VERSION(6, 1, 1):

	case IP_VERSION(6, 1, 2):

	case IP_VERSION(6, 1, 3):

	case IP_VERSION(7, 0, 0):

	case IP_VERSION(7, 0, 1):

		/* Reserve 1 for paging and 1 for gfx */