drm/amdgpu: Add sdma v4_4_5 ip block

Add sdma v4_4_5 ip block support

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Le Ma <le.ma@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 d6a1b262236d50826b6f4db20fa7390ae7ef5e31..911ac69b1ae4864c59dff8fbbd4a0bac9e67503d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1781,6 +1781,7 @@ static int amdgpu_discovery_set_ih_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(4, 2, 1):
        case IP_VERSION(4, 4, 0):
        case IP_VERSION(4, 4, 2):
+       case IP_VERSION(4, 4, 5):
                amdgpu_device_ip_block_add(adev, &vega20_ih_ip_block);
                break;
        case IP_VERSION(5, 0, 0):
@@ -2064,6 +2065,7 @@ static int amdgpu_discovery_set_sdma_ip_blocks(struct amdgpu_device *adev)
                amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
                break;
        case IP_VERSION(4, 4, 2):
+       case IP_VERSION(4, 4, 5):
                amdgpu_device_ip_block_add(adev, &sdma_v4_4_2_ip_block);
                break;
        case IP_VERSION(5, 0, 0):
@@ -2616,6 +2618,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(4, 2, 1):
        case IP_VERSION(4, 4, 0):
        case IP_VERSION(4, 4, 2):
+       case IP_VERSION(4, 4, 5):
                adev->hdp.funcs = &hdp_v4_0_funcs;
                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 6d23588ef2a2e479df69b014b117c8b5e1b9e16b..151f83ea803bb3bf905b656dec95b59ec864ef7e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
@@ -258,11 +258,12 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,
                                else {
                                        /* Use a single copy per SDMA firmware type. PSP uses the same instance for all
                                         * groups of SDMAs */
-                                       if (amdgpu_ip_version(adev, SDMA0_HWIP,
-                                                             0) ==
-                                                   IP_VERSION(4, 4, 2) &&
+                                       if ((amdgpu_ip_version(adev, SDMA0_HWIP, 0) ==
+                                               IP_VERSION(4, 4, 2) ||
+                                            amdgpu_ip_version(adev, SDMA0_HWIP, 0) ==
+                                               IP_VERSION(4, 4, 5)) &&
                                            adev->firmware.load_type ==
-                                                   AMDGPU_FW_LOAD_PSP &&
+                                               AMDGPU_FW_LOAD_PSP &&
                                            adev->sdma.num_inst_per_aid == i) {
                                                break;
                                        }

diff --git a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
index 4db6bb73ead427d1c95a98ed55b42cadb0af0e95..077c6d920e27f219257d7798453ed91cdc057f32 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
@@ -50,7 +50,8 @@ static void hdp_v4_0_invalidate_hdp(struct amdgpu_device *adev,
                                    struct amdgpu_ring *ring)
 {
        if (amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 0) ||
-           amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 2))
+           amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+           amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 5))
                return;
 
        if (!ring || !ring->funcs->emit_wreg)
@@ -129,7 +130,8 @@ static void hdp_v4_0_get_clockgating_state(struct amdgpu_device *adev,
 {
        int data;
 
-       if (amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 2)) {
+       if (amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+           amdgpu_ip_version(adev, HDP_HWIP, 0) == IP_VERSION(4, 4, 5)) {
                /* Default enabled */
                *flags |= AMD_CG_SUPPORT_HDP_MGCG;
                return;

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 341b24d8320bd6185404ee2a4e0af4b5902d8797..01644a869738842c250e19094dd6d2da991a5bc5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -44,6 +44,7 @@
 #include "amdgpu_ras.h"
 
 MODULE_FIRMWARE("amdgpu/sdma_4_4_2.bin");
+MODULE_FIRMWARE("amdgpu/sdma_4_4_5.bin");
 
 #define mmSMNAID_AID0_MCA_SMU 0x03b30400
 
@@ -134,8 +135,8 @@ static int sdma_v4_4_2_init_microcode(struct amdgpu_device *adev)
        int ret, i;
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
-               if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) ==
-                   IP_VERSION(4, 4, 2)) {
+               if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+                   amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 5)) {
                        ret = amdgpu_sdma_init_microcode(adev, 0, true);
                        break;
                } else {
@@ -1229,6 +1230,7 @@ static bool sdma_v4_4_2_fw_support_paging_queue(struct amdgpu_device *adev)
 {
        switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
        case IP_VERSION(4, 4, 2):
+       case IP_VERSION(4, 4, 5):
                return false;
        default:
                return false;
@@ -1392,7 +1394,8 @@ static int sdma_v4_4_2_sw_fini(void *handle)
                        amdgpu_ring_fini(&adev->sdma.instance[i].page);
        }
 
-       if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 2))
+       if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+           amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(4, 4, 5))
                amdgpu_sdma_destroy_inst_ctx(adev, true);
        else
                amdgpu_sdma_destroy_inst_ctx(adev, false);

diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c
index b9e7858466376c007a40f7c5b487e813647d3e14..ac439f0565e357bb555c67095fc0b5324356090e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c
@@ -306,7 +306,8 @@ static int vega20_ih_irq_init(struct amdgpu_device *adev)
                 * driver needs to program it properly according to
                 * MC_SPACE type in IH_RB_CNTL */
                if ((amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 0)) ||
-                   (amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 2))) {
+                   (amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 2)) ||
+                   (amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 5))) {
                        ih_chicken = RREG32_SOC15(OSSSYS, 0, mmIH_CHICKEN_ALDEBARAN);
                        if (adev->irq.ih.use_bus_addr) {
                                ih_chicken = REG_SET_FIELD(ih_chicken, IH_CHICKEN,
@@ -337,7 +338,8 @@ static int vega20_ih_irq_init(struct amdgpu_device *adev)
 
        /* Enable IH Retry CAM */
        if (amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 0) ||
-           amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 2))
+           amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 2) ||
+           amdgpu_ip_version(adev, OSSSYS_HWIP, 0) == IP_VERSION(4, 4, 5))
                WREG32_FIELD15(OSSSYS, 0, IH_RETRY_INT_CAM_CNTL_ALDEBARAN,
                               ENABLE, 1);
        else
@@ -562,7 +564,8 @@ static int vega20_ih_sw_init(void *handle)
        adev->irq.ih1.use_doorbell = true;
        adev->irq.ih1.doorbell_index = (adev->doorbell_index.ih + 1) << 1;
 
-       if (amdgpu_ip_version(adev, OSSSYS_HWIP, 0) != IP_VERSION(4, 4, 2)) {
+       if (amdgpu_ip_version(adev, OSSSYS_HWIP, 0) != IP_VERSION(4, 4, 2) &&
+           amdgpu_ip_version(adev, OSSSYS_HWIP, 0) != IP_VERSION(4, 4, 5)) {
                r = amdgpu_ih_ring_init(adev, &adev->irq.ih2, PAGE_SIZE, true);
                if (r)
                        return r;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index 9596bca572129d108e5f3d2f80f815e8e011a68a..3c4b758d9733d402d8901b9be3ab459b0215659d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -83,6 +83,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd)
        case IP_VERSION(4, 2, 2):/* ARCTURUS */
        case IP_VERSION(4, 4, 0):/* ALDEBARAN */
        case IP_VERSION(4, 4, 2):
+       case IP_VERSION(4, 4, 5):
        case IP_VERSION(5, 0, 0):/* NAVI10 */
        case IP_VERSION(5, 0, 1):/* CYAN_SKILLFISH */
        case IP_VERSION(5, 0, 2):/* NAVI14 */