[PATCH] drm/amdgpu: add support for GC 10.1.4

Huang, Ray Ray.Huang at amd.com
Fri Feb 11 02:21:51 UTC 2022


[Public]

Reviewed-by: Huang Rui <ray.huang at amd.com>

From: Deucher, Alexander <Alexander.Deucher at amd.com>
Sent: Thursday, February 10, 2022 10:57 PM
To: Yu, Lang <Lang.Yu at amd.com>; amd-gfx at lists.freedesktop.org
Cc: Huang, Ray <Ray.Huang at amd.com>
Subject: Re: [PATCH] drm/amdgpu: add support for GC 10.1.4


[Public]

Reviewed-by: Alex Deucher <alexander.deucher at amd.com<mailto:alexander.deucher at amd.com>>
________________________________
From: Yu, Lang <Lang.Yu at amd.com<mailto:Lang.Yu at amd.com>>
Sent: Thursday, February 10, 2022 1:20 AM
To: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> <amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>>
Cc: Deucher, Alexander <Alexander.Deucher at amd.com<mailto:Alexander.Deucher at amd.com>>; Huang, Ray <Ray.Huang at amd.com<mailto:Ray.Huang at amd.com>>; Yu, Lang <Lang.Yu at amd.com<mailto:Lang.Yu at amd.com>>
Subject: [PATCH] drm/amdgpu: add support for GC 10.1.4

Add basic support for GC 10.1.4,
it uses same IP blocks with GC 10.1.3

Signed-off-by: Lang Yu <Lang.Yu at amd.com<mailto:Lang.Yu at amd.com>>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 ++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c       | 3 ++-
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c        | 9 +++++++++
 drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c        | 4 +++-
 drivers/gpu/drm/amd/amdgpu/nv.c               | 1 +
 drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c        | 3 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_crat.c         | 1 +
 drivers/gpu/drm/amd/amdkfd/kfd_device.c       | 2 ++
 8 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index eb4b7059633d..cd7e8522c130 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -674,6 +674,7 @@ static int amdgpu_discovery_set_common_ip_blocks(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 0):
         case IP_VERSION(10, 3, 1):
         case IP_VERSION(10, 3, 2):
@@ -709,6 +710,7 @@ static int amdgpu_discovery_set_gmc_ip_blocks(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 0):
         case IP_VERSION(10, 3, 1):
         case IP_VERSION(10, 3, 2):
@@ -910,6 +912,7 @@ static int amdgpu_discovery_set_gc_ip_blocks(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 0):
         case IP_VERSION(10, 3, 2):
         case IP_VERSION(10, 3, 1):
@@ -1044,6 +1047,7 @@ static int amdgpu_discovery_set_mes_ip_blocks(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 0):
         case IP_VERSION(10, 3, 1):
         case IP_VERSION(10, 3, 2):
@@ -1243,6 +1247,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 0):
         case IP_VERSION(10, 3, 2):
         case IP_VERSION(10, 3, 4):
@@ -1264,6 +1269,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
         case IP_VERSION(9, 2, 2):
         case IP_VERSION(9, 3, 0):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 1):
         case IP_VERSION(10, 3, 3):
                 adev->flags |= AMD_IS_APU;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index f2806959736a..9bc9155cbf06 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -137,7 +137,8 @@ static int psp_early_init(void *handle)
                 psp->autoload_supported = true;
                 break;
         case IP_VERSION(11, 0, 8):
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2) {
+               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 ||
+                   adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 4)) {
                         psp_v11_0_8_set_psp_funcs(psp);
                         psp->autoload_supported = false;
                 }
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 3d8c5fea572e..8fb4528c741f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -3641,6 +3641,7 @@ static void gfx_v10_0_init_golden_registers(struct amdgpu_device *adev)
                                                 (const u32)ARRAY_SIZE(golden_settings_gc_10_3_5));
                 break;
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                 soc15_program_register_sequence(adev,
                                                 golden_settings_gc_10_0_cyan_skillfish,
                                                 (const u32)ARRAY_SIZE(golden_settings_gc_10_0_cyan_skillfish));
@@ -3819,6 +3820,7 @@ static void gfx_v10_0_check_fw_write_wait(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                 if ((adev->gfx.me_fw_version >= 0x00000046) &&
                     (adev->gfx.me_feature_version >= 27) &&
                     (adev->gfx.pfp_fw_version >= 0x00000068) &&
@@ -3959,6 +3961,9 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
                 else
                         chip_name = "cyan_skillfish";
                 break;
+       case IP_VERSION(10, 1, 4):
+               chip_name = "cyan_skillfish2";
+               break;
         default:
                 BUG();
         }
@@ -4565,6 +4570,7 @@ static void gfx_v10_0_gpu_early_init(struct amdgpu_device *adev)
                         1 << REG_GET_FIELD(gb_addr_config, GB_ADDR_CONFIG, NUM_PKRS);
                 break;
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                 adev->gfx.config.max_hw_contexts = 8;
                 adev->gfx.config.sc_prim_fifo_size_frontend = 0x20;
                 adev->gfx.config.sc_prim_fifo_size_backend = 0x100;
@@ -4677,6 +4683,7 @@ static int gfx_v10_0_sw_init(void *handle)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                 adev->gfx.me.num_me = 1;
                 adev->gfx.me.num_pipe_per_me = 1;
                 adev->gfx.me.num_queue_per_pipe = 1;
@@ -7658,6 +7665,7 @@ static int gfx_v10_0_early_init(void *handle)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                 adev->gfx.num_gfx_rings = GFX10_NUM_GFX_RINGS_NV1X;
                 break;
         case IP_VERSION(10, 3, 0):
@@ -9418,6 +9426,7 @@ static void gfx_v10_0_set_rlc_funcs(struct amdgpu_device *adev)
         case IP_VERSION(10, 1, 10):
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 2):
         case IP_VERSION(10, 3, 1):
         case IP_VERSION(10, 3, 4):
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index bddaf2417344..c64e3a391c99 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -881,6 +881,7 @@ static int gmc_v10_0_sw_init(void *handle)
         case IP_VERSION(10, 1, 1):
         case IP_VERSION(10, 1, 2):
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 3, 0):
         case IP_VERSION(10, 3, 2):
         case IP_VERSION(10, 3, 1):
@@ -1156,7 +1157,8 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;

-       if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 3))
+       if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 3) ||
+           adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 4))
                 return;

         adev->mmhub.funcs->get_clockgating(adev, flags);
diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index f76834085b34..5e9ab31fee6b 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -902,6 +902,7 @@ static int nv_common_early_init(void *handle)
                         adev->external_rev_id = adev->rev_id + 0x01;
                 break;
         case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                 adev->cg_flags = 0;
                 adev->pg_flags = 0;
                 adev->external_rev_id = adev->rev_id + 0x82;
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 81e033549dda..45e10d5028c5 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -264,7 +264,8 @@ static int sdma_v5_0_init_microcode(struct amdgpu_device *adev)
                 chip_name = "navi12";
                 break;
         case IP_VERSION(5, 0, 1):
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
+               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 ||
+                   adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 4))
                         chip_name = "cyan_skillfish2";
                 else
                         chip_name = "cyan_skillfish";
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index 9624bbe8b501..bb6e49661d13 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -1411,6 +1411,7 @@ static int kfd_fill_gpu_cache_info(struct kfd_dev *kdev,
                 case IP_VERSION(10, 1, 10):
                 case IP_VERSION(10, 1, 2):
                 case IP_VERSION(10, 1, 3):
+               case IP_VERSION(10, 1, 4):
                         pcache_info = navi10_cache_info;
                         num_of_cache_types = ARRAY_SIZE(navi10_cache_info);
                         break;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index dbb877fba724..7f1746289989 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -110,6 +110,7 @@ static void kfd_device_info_set_event_interrupt_class(struct kfd_dev *kfd)
         case IP_VERSION(10, 3, 1): /* VANGOGH */
         case IP_VERSION(10, 3, 3): /* YELLOW_CARP */
         case IP_VERSION(10, 1, 3): /* CYAN_SKILLFISH */
+       case IP_VERSION(10, 1, 4):
         case IP_VERSION(10, 1, 10): /* NAVI10 */
         case IP_VERSION(10, 1, 2): /* NAVI12 */
         case IP_VERSION(10, 1, 1): /* NAVI14 */
@@ -307,6 +308,7 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf)
                         break;
                 /* Cyan Skillfish */
                 case IP_VERSION(10, 1, 3):
+               case IP_VERSION(10, 1, 4):
                         gfx_target_version = 100103;
                         if (!vf)
                                 f2g = &gfx_v10_kfd2kgd;
--
2.25.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20220211/764ae783/attachment-0001.htm>


More information about the amd-gfx mailing list