drm/amdgpu: add support for SDMA IP version 6.1.4

This initializes SDMA IP version 6.1.4.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Tim Huang <tim.huang@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 116cb437c81bbe730a8b1d4836c41dff3db35034..ba3a1eb116dfe74d58b71f4e99bcb34864e1e921 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2420,6 +2420,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(6, 1, 1):
        case IP_VERSION(6, 1, 2):
        case IP_VERSION(6, 1, 3):
+       case IP_VERSION(6, 1, 4):
                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 f38c2bdd01e3c168c76efb9ef05b5a32b1c6e231..651fdfc94a0a86d0c9f7868f26f63bafd343c0f7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -54,6 +54,7 @@ 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");
+MODULE_FIRMWARE("amdgpu/sdma_6_1_4.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 fa6ae63490e53c890d07eff8d86bd48ffa612de8..9c0639bd72e7a44b58683f4c3e11e0b2963b0729 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -104,6 +104,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(6, 1, 1):
        case IP_VERSION(6, 1, 2):
        case IP_VERSION(6, 1, 3):
+       case IP_VERSION(6, 1, 4):
        case IP_VERSION(7, 0, 0):
        case IP_VERSION(7, 0, 1):
        case IP_VERSION(7, 1, 0):