drm/amdgpu: update golden setting for oland

Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 232ee8909d38..8e2377b7fcf5 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -340,6 +340,7 @@ static const u32 verde_golden_registers[] =
 
 static const u32 oland_golden_registers[] =
 {
+        0x17bc, 0x00000030, 0x00000011,
         0x2684, 0x00010000, 0x00018208,
         0x260c, 0xffffffff, 0x00000000,
         0x260d, 0xf00fffff, 0x00000400,
@@ -348,7 +349,7 @@ static const u32 oland_golden_registers[] =
         0x340c, 0x000300c0, 0x00800040,
         0x360c, 0x000300c0, 0x00800040,
         0x16ec, 0x000000f0, 0x00000070,
-        0x16f9, 0x00200000, 0x50100000,
+        0x16f0, 0x00200000, 0x50100000,
         0x1c0c, 0x31000311, 0x00000011,
         0x0ab9, 0x00073ffe, 0x000022a2,
         0x0903, 0x000007ff, 0x00000000,
@@ -357,7 +358,7 @@ static const u32 oland_golden_registers[] =
         0x22c4, 0x0000ff0f, 0x00000000,
         0xa293, 0x07ffffff, 0x4e000000,
         0xa0d4, 0x3f3f3fff, 0x00000082,
-        0x000c, 0x000000ff, 0x0040,
+        0x000c, 0xffffffff, 0x0040,
         0x000d, 0x00000040, 0x00004040,
         0x2440, 0x07ffffff, 0x03000000,
         0x2418, 0x0000007f, 0x00000020,
@@ -366,11 +367,16 @@ static const u32 oland_golden_registers[] =
         0x2b04, 0xffffffff, 0x00000000,
         0x2b03, 0xffffffff, 0x00003210,
         0x2235, 0x0000001f, 0x00000010,
-        0x0570, 0x000c0fc0, 0x000c0400
+        0x0570, 0x000c0fc0, 0x000c0400,
+        0x052c, 0x0fffffff, 0xffffffff,
+        0x052d, 0x0fffffff, 0x0fffffff,
+        0x052e, 0x0fffffff, 0x0fffffff,
+        0x052f, 0x0fffffff, 0x0fffffff
 };
 
 static const u32 oland_golden_rlc_registers[] =
 {
+        0x263e, 0xffffffff, 0x02010002,
         0x3109, 0xffffffff, 0x00601005,
         0x311f, 0xffffffff, 0x10104040,
         0x3122, 0xffffffff, 0x0100000a,
@@ -809,18 +815,18 @@ static const u32 oland_mgcg_cgcg_init[] =
         0x21c2, 0xffffffff, 0x00900100,
         0x311e, 0xffffffff, 0x00000080,
         0x3101, 0xffffffff, 0x0020003f,
-        0xc, 0xffffffff, 0x0000001c,
-        0xd, 0x000f0000, 0x000f0000,
-        0x583, 0xffffffff, 0x00000100,
-        0x409, 0xffffffff, 0x00000100,
-        0x40b, 0x00000101, 0x00000000,
-        0x82a, 0xffffffff, 0x00000104,
-        0x993, 0x000c0000, 0x000c0000,
-        0x992, 0x000c0000, 0x000c0000,
+        0x000c, 0xffffffff, 0x0000001c,
+        0x000d, 0x000f0000, 0x000f0000,
+        0x0583, 0xffffffff, 0x00000100,
+        0x0409, 0xffffffff, 0x00000100,
+        0x040b, 0x00000101, 0x00000000,
+        0x082a, 0xffffffff, 0x00000104,
+        0x0993, 0x000c0000, 0x000c0000,
+        0x0992, 0x000c0000, 0x000c0000,
         0x1579, 0xff000fff, 0x00000100,
         0x157a, 0x00000001, 0x00000001,
-        0xbd4, 0x00000001, 0x00000001,
-        0xc33, 0xc0000fff, 0x00000104,
+        0x0bd4, 0x00000001, 0x00000001,
+        0x0c33, 0xc0000fff, 0x00000104,
         0x3079, 0x00000001, 0x00000001,
         0x3430, 0xfffffff0, 0x00000100,
         0x3630, 0xfffffff0, 0x00000100