drm/amdgpu: add support for SDMA IP version 6.1.3

This initializes SDMA IP version 6.1.3.

Signed-off-by: Tim Huang <tim.huang@amd.com>
Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index ea31418a479b5cf45f7d133d261d675bdbe0682a..27b90fc7967e0351567f56367df612341755a577 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -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):

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 1a023b45f0be89503fc496beebaa7a2457229a1d..b39705aff3f8a3df6ab8bc3428f2cc5f8e253568 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -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

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index b5d70d8032898f0b66901ade5e72bf391e013c87..bd582ef4b935281891a91a68a0cc0852d0e05678 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -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 */