aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/si.c
diff options
context:
space:
mode:
authorFlora Cui <Flora.Cui@amd.com>2016-12-14 01:35:49 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-12-20 19:42:12 -0500
commit7c0a705e0326a7eed2149eb0b7b30e23897becda (patch)
treecfc37ba3e928da492343f11fafb78f4cc458ebd2 /drivers/gpu/drm/amd/amdgpu/si.c
parenta1f49cc179ce6b7b7758ae3ff5cdb138d0ee0f56 (diff)
drm/amdgpu: update golden setting/tiling table of tahiti
Signed-off-by: Flora Cui <Flora.Cui@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/si.c38
1 files changed, 23 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 3ed8ad8725b9..243987502f7e 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -43,13 +43,14 @@
43 43
44static const u32 tahiti_golden_registers[] = 44static const u32 tahiti_golden_registers[] =
45{ 45{
46 0x17bc, 0x00000030, 0x00000011,
46 0x2684, 0x00010000, 0x00018208, 47 0x2684, 0x00010000, 0x00018208,
47 0x260c, 0xffffffff, 0x00000000, 48 0x260c, 0xffffffff, 0x00000000,
48 0x260d, 0xf00fffff, 0x00000400, 49 0x260d, 0xf00fffff, 0x00000400,
49 0x260e, 0x0002021c, 0x00020200, 50 0x260e, 0x0002021c, 0x00020200,
50 0x031e, 0x00000080, 0x00000000, 51 0x031e, 0x00000080, 0x00000000,
51 0x340c, 0x000300c0, 0x00800040, 52 0x340c, 0x000000c0, 0x00800040,
52 0x360c, 0x000300c0, 0x00800040, 53 0x360c, 0x000000c0, 0x00800040,
53 0x16ec, 0x000000f0, 0x00000070, 54 0x16ec, 0x000000f0, 0x00000070,
54 0x16f0, 0x00200000, 0x50100000, 55 0x16f0, 0x00200000, 0x50100000,
55 0x1c0c, 0x31000311, 0x00000011, 56 0x1c0c, 0x31000311, 0x00000011,
@@ -60,7 +61,7 @@ static const u32 tahiti_golden_registers[] =
60 0x22c4, 0x0000ff0f, 0x00000000, 61 0x22c4, 0x0000ff0f, 0x00000000,
61 0xa293, 0x07ffffff, 0x4e000000, 62 0xa293, 0x07ffffff, 0x4e000000,
62 0xa0d4, 0x3f3f3fff, 0x2a00126a, 63 0xa0d4, 0x3f3f3fff, 0x2a00126a,
63 0x000c, 0x000000ff, 0x0040, 64 0x000c, 0xffffffff, 0x0040,
64 0x000d, 0x00000040, 0x00004040, 65 0x000d, 0x00000040, 0x00004040,
65 0x2440, 0x07ffffff, 0x03000000, 66 0x2440, 0x07ffffff, 0x03000000,
66 0x23a2, 0x01ff1f3f, 0x00000000, 67 0x23a2, 0x01ff1f3f, 0x00000000,
@@ -73,7 +74,11 @@ static const u32 tahiti_golden_registers[] =
73 0x2234, 0xffffffff, 0x000fff40, 74 0x2234, 0xffffffff, 0x000fff40,
74 0x2235, 0x0000001f, 0x00000010, 75 0x2235, 0x0000001f, 0x00000010,
75 0x0504, 0x20000000, 0x20fffed8, 76 0x0504, 0x20000000, 0x20fffed8,
76 0x0570, 0x000c0fc0, 0x000c0400 77 0x0570, 0x000c0fc0, 0x000c0400,
78 0x052c, 0x0fffffff, 0xffffffff,
79 0x052d, 0x0fffffff, 0x0fffffff,
80 0x052e, 0x0fffffff, 0x0fffffff,
81 0x052f, 0x0fffffff, 0x0fffffff
77}; 82};
78 83
79static const u32 tahiti_golden_registers2[] = 84static const u32 tahiti_golden_registers2[] =
@@ -83,12 +88,13 @@ static const u32 tahiti_golden_registers2[] =
83 88
84static const u32 tahiti_golden_rlc_registers[] = 89static const u32 tahiti_golden_rlc_registers[] =
85{ 90{
91 0x263e, 0xffffffff, 0x12011003,
86 0x3109, 0xffffffff, 0x00601005, 92 0x3109, 0xffffffff, 0x00601005,
87 0x311f, 0xffffffff, 0x10104040, 93 0x311f, 0xffffffff, 0x10104040,
88 0x3122, 0xffffffff, 0x0100000a, 94 0x3122, 0xffffffff, 0x0100000a,
89 0x30c5, 0xffffffff, 0x00000800, 95 0x30c5, 0xffffffff, 0x00000800,
90 0x30c3, 0xffffffff, 0x800000f4, 96 0x30c3, 0xffffffff, 0x800000f4,
91 0x3d2a, 0xffffffff, 0x00000000 97 0x3d2a, 0x00000008, 0x00000000
92}; 98};
93 99
94static const u32 pitcairn_golden_registers[] = 100static const u32 pitcairn_golden_registers[] =
@@ -513,18 +519,18 @@ static const u32 tahiti_mgcg_cgcg_init[] =
513 0x21c2, 0xffffffff, 0x00900100, 519 0x21c2, 0xffffffff, 0x00900100,
514 0x311e, 0xffffffff, 0x00000080, 520 0x311e, 0xffffffff, 0x00000080,
515 0x3101, 0xffffffff, 0x0020003f, 521 0x3101, 0xffffffff, 0x0020003f,
516 0xc, 0xffffffff, 0x0000001c, 522 0x000c, 0xffffffff, 0x0000001c,
517 0xd, 0x000f0000, 0x000f0000, 523 0x000d, 0x000f0000, 0x000f0000,
518 0x583, 0xffffffff, 0x00000100, 524 0x0583, 0xffffffff, 0x00000100,
519 0x409, 0xffffffff, 0x00000100, 525 0x0409, 0xffffffff, 0x00000100,
520 0x40b, 0x00000101, 0x00000000, 526 0x040b, 0x00000101, 0x00000000,
521 0x82a, 0xffffffff, 0x00000104, 527 0x082a, 0xffffffff, 0x00000104,
522 0x993, 0x000c0000, 0x000c0000, 528 0x0993, 0x000c0000, 0x000c0000,
523 0x992, 0x000c0000, 0x000c0000, 529 0x0992, 0x000c0000, 0x000c0000,
524 0x1579, 0xff000fff, 0x00000100, 530 0x1579, 0xff000fff, 0x00000100,
525 0x157a, 0x00000001, 0x00000001, 531 0x157a, 0x00000001, 0x00000001,
526 0xbd4, 0x00000001, 0x00000001, 532 0x0bd4, 0x00000001, 0x00000001,
527 0xc33, 0xc0000fff, 0x00000104, 533 0x0c33, 0xc0000fff, 0x00000104,
528 0x3079, 0x00000001, 0x00000001, 534 0x3079, 0x00000001, 0x00000001,
529 0x3430, 0xfffffff0, 0x00000100, 535 0x3430, 0xfffffff0, 0x00000100,
530 0x3630, 0xfffffff0, 0x00000100 536 0x3630, 0xfffffff0, 0x00000100
@@ -1179,6 +1185,8 @@ static int si_common_early_init(void *handle)
1179 AMD_CG_SUPPORT_HDP_LS | 1185 AMD_CG_SUPPORT_HDP_LS |
1180 AMD_CG_SUPPORT_HDP_MGCG; 1186 AMD_CG_SUPPORT_HDP_MGCG;
1181 adev->pg_flags = 0; 1187 adev->pg_flags = 0;
1188 adev->external_rev_id = (adev->rev_id == 0) ? 1 :
1189 (adev->rev_id == 1) ? 5 : 6;
1182 break; 1190 break;
1183 case CHIP_PITCAIRN: 1191 case CHIP_PITCAIRN:
1184 adev->cg_flags = 1192 adev->cg_flags =
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-27 07:12:21 -0400