drm/amdgpu: add support for SDMA IP version 6.4.0

This initializes SDMA IP version 6.4.0.

Signed-off-by: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 ee449097e6ab4a10a703661d0a103a6eb024fce2..3063d1f33aa00759741b3955f3528be03b662719 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2564,6 +2564,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(6, 1, 2):
        case IP_VERSION(6, 1, 3):
        case IP_VERSION(6, 1, 4):
+       case IP_VERSION(6, 4, 0):
                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 bf09ac841a684172ccbcd1a3ad162f9e79c68f79..d894b7599c183a4324124e7c05118fe942a933b0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -55,6 +55,7 @@ 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");
+MODULE_FIRMWARE("amdgpu/sdma_6_4_0.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 e5aa9e005862c1fecfad0f30c7a4ce0f1bcddf05..f48eb0f739afdfc77adb03d70a9362efb8e600dd 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -106,6 +106,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(6, 1, 2):
        case IP_VERSION(6, 1, 3):
        case IP_VERSION(6, 1, 4):
+       case IP_VERSION(6, 4, 0):
        case IP_VERSION(7, 0, 0):
        case IP_VERSION(7, 0, 1):
        case IP_VERSION(7, 1, 0):