drm/amdgpu: add initial support for sdma444

add sdma444 basic support

Signed-off-by: Le Ma <le.ma@amd.com>
Reviewed-by: Hawking Zhang <Hawking.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 2d0bcd85cb490f5dae83056de1e44f7fbc296006..57b36cae64546d7c88a2c653f9bb18f8b02673f0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2241,6 +2241,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)
                break;
        case IP_VERSION(4, 4, 2):
        case IP_VERSION(4, 4, 5):
+       case IP_VERSION(4, 4, 4):
                amdgpu_device_ip_block_add(adev, &sdma_v4_4_2_ip_block);
                break;
        case IP_VERSION(5, 0, 0):

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
index b3c032f249f5334f06a241988697c11c7bbaa9b6..632295bf3875394c7b69935fc62b3803abc83651 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
@@ -262,6 +262,8 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,
                                         * groups of SDMAs */
                                        if ((amdgpu_ip_version(adev, SDMA0_HWIP, 0) ==
                                                IP_VERSION(4, 4, 2) ||
+                                            amdgpu_ip_version(adev, SDMA0_HWIP, 0) ==
+                                               IP_VERSION(4, 4, 4) ||
                                             amdgpu_ip_version(adev, SDMA0_HWIP, 0) ==
                                                IP_VERSION(4, 4, 5)) &&
                                            adev->firmware.load_type ==

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index ef6f852d43dde9e1e5e6352a87c911c638d71c07..5e1cb1c2c0f80dccab78b093eab2777964e18fb4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -189,6 +189,7 @@ static int sdma_v4_4_2_init_microcode(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+                   amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 4) ||
                    amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 5)) {
                        ret = amdgpu_sdma_init_microcode(adev, 0, true);
                        break;
@@ -1485,6 +1486,7 @@ static int sdma_v4_4_2_sw_fini(struct amdgpu_ip_block *ip_block)
 
        amdgpu_sdma_sysfs_reset_mask_fini(adev);
        if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+           amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 4) ||
            amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 5))
                amdgpu_sdma_destroy_inst_ctx(adev, true);
        else