[PATCH 06/11] drm/amdgpu: Apply gc v9_5_0 golden settings

[Alex Deucher]

From: Hawking Zhang <hawking.zh...@amd.com>

Apply gc v9_5_0 golden settings.

Signed-off-by: Hawking Zhang <hawking.zh...@amd.com>
Reviewed-by: Asad Kamal <asad.ka...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index b755de502da5c..d703bb7e5f460 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -351,13 +351,17 @@ static void gfx_v9_4_3_init_golden_registers(struct 
amdgpu_device *adev)
 
                WREG32_SOC15(GC, dev_inst, regGB_ADDR_CONFIG,
                             GOLDEN_GB_ADDR_CONFIG);
-               /* Golden settings applied by driver for ASIC with rev_id 0 */
-               if (adev->rev_id == 0) {
-                       WREG32_FIELD15_PREREG(GC, dev_inst, TCP_UTCL1_CNTL1,
-                                             REDUCE_FIFO_DEPTH_BY_2, 2);
+               if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 5, 0)) 
{
+                       WREG32_FIELD15_PREREG(GC, dev_inst, TCP_UTCL1_CNTL2, 
SPARE, 0x1);
                } else {
-                       WREG32_FIELD15_PREREG(GC, dev_inst, TCP_UTCL1_CNTL2,
-                                               SPARE, 0x1);
+                       /* Golden settings applied by driver for ASIC with 
rev_id 0 */
+                       if (adev->rev_id == 0) {
+                               WREG32_FIELD15_PREREG(GC, dev_inst, 
TCP_UTCL1_CNTL1,
+                                                     REDUCE_FIFO_DEPTH_BY_2, 
2);
+                       } else {
+                               WREG32_FIELD15_PREREG(GC, dev_inst, 
TCP_UTCL1_CNTL2,
+                                                     SPARE, 0x1);
+                       }
                }
        }
 }
-- 
2.47.0