drm/amdgpu: update si kicker smc firmware
Subsystems (2)
PATCH 1/9 drm/amdgpu: update si kicker smc firmware
--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/si_dpm.c +28 -28
@@ -56,7 +56,6 @@#define BIOS_SCRATCH_4 0x5cdMODULE_FIRMWARE ("radeon/tahiti_smc.bin" ); -MODULE_FIRMWARE ("radeon/tahiti_k_smc.bin" );MODULE_FIRMWARE ("radeon/pitcairn_smc.bin" );MODULE_FIRMWARE ("radeon/pitcairn_k_smc.bin" );MODULE_FIRMWARE ("radeon/verde_smc.bin" );
@@ -7686,48 +7685,49 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev) chip_name ="tahiti" ;break ;case CHIP_PITCAIRN : -if ((adev->pdev->revision ==0x81 ) || - (adev->pdev->device ==0x6810 ) || - (adev->pdev->device ==0x6811 ) || - (adev->pdev->device ==0x6816 ) || - (adev->pdev->device ==0x6817 ) || - (adev->pdev->device ==0x6806 )) +if ((adev->pdev->revision ==0x81 ) && + ((adev->pdev->device ==0x6810 ) || + (adev->pdev->device ==0x6811 ))) chip_name ="pitcairn_k" ;else chip_name ="pitcairn" ;break ;case CHIP_VERDE : -if ((adev->pdev->revision ==0x81 ) || - (adev->pdev->revision ==0x83 ) || - (adev->pdev->revision ==0x87 ) || - (adev->pdev->device ==0x6820 ) || - (adev->pdev->device ==0x6821 ) || - (adev->pdev->device ==0x6822 ) || - (adev->pdev->device ==0x6823 ) || - (adev->pdev->device ==0x682A ) || - (adev->pdev->device ==0x682B )) +if (((adev->pdev->device ==0x6820 ) && + ((adev->pdev->revision ==0x81 ) || + (adev->pdev->revision ==0x83 ))) || + ((adev->pdev->device ==0x6821 ) && + ((adev->pdev->revision ==0x83 ) || + (adev->pdev->revision ==0x87 ))) || + ((adev->pdev->revision ==0x87 ) && + ((adev->pdev->device ==0x6823 ) || + (adev->pdev->device ==0x682b )))) chip_name ="verde_k" ;else chip_name ="verde" ;break ;case CHIP_OLAND : -if ((adev->pdev->revision ==0xC7 ) || - (adev->pdev->revision ==0x80 ) || - (adev->pdev->revision ==0x81 ) || - (adev->pdev->revision ==0x83 ) || - (adev->pdev->device ==0x6604 ) || - (adev->pdev->device ==0x6605 )) +if (((adev->pdev->revision ==0x81 ) && + ((adev->pdev->device ==0x6600 ) || + (adev->pdev->device ==0x6604 ) || + (adev->pdev->device ==0x6605 ) || + (adev->pdev->device ==0x6610 ))) || + ((adev->pdev->revision ==0x83 ) && + (adev->pdev->device ==0x6610 ))) chip_name ="oland_k" ;else chip_name ="oland" ;break ;case CHIP_HAINAN : -if ((adev->pdev->revision ==0x81 ) || - (adev->pdev->revision ==0x83 ) || - (adev->pdev->revision ==0xC3 ) || - (adev->pdev->device ==0x6664 ) || - (adev->pdev->device ==0x6665 ) || - (adev->pdev->device ==0x6667 )) +if (((adev->pdev->revision ==0x81 ) && + (adev->pdev->device ==0x6660 )) || + ((adev->pdev->revision ==0x83 ) && + ((adev->pdev->device ==0x6660 ) || + (adev->pdev->device ==0x6663 ) || + (adev->pdev->device ==0x6665 ) || + (adev->pdev->device ==0x6667 ))) || + ((adev->pdev->revision ==0xc3 ) && + (adev->pdev->device ==0x6665 ))) chip_name ="hainan_k" ;else chip_name ="hainan" ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1481787157-20840-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org
PATCH 2/9 drm/amdgpu: update golden setting for pitcairn
--- drivers/gpu/drm/amd/amdgpu/si.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +16 -10
@@ -99,6 +99,7 @@ static const u32 tahiti_golden_rlc_registers[] =static const u32 pitcairn_golden_registers[] = { +0x17bc ,0x00000030 ,0x00000011 ,0x2684 ,0x00010000 ,0x00018208 ,0x260c ,0xffffffff ,0x00000000 ,0x260d ,0xf00fffff ,0x00000400 ,
@@ -116,7 +117,7 @@ static const u32 pitcairn_golden_registers[] =0x22c4 ,0x0000ff0f ,0x00000000 ,0xa293 ,0x07ffffff ,0x4e000000 ,0xa0d4 ,0x3f3f3fff ,0x2a00126a , -0x000c ,0x000000ff ,0x0040 , +0x000c ,0xffffffff ,0x0040 ,0x000d ,0x00000040 ,0x00004040 ,0x2440 ,0x07ffffff ,0x03000000 , 0x2418, 0x0000007f, 0x00000020,
@@ -125,11 +126,16 @@ static const u32 pitcairn_golden_registers[] =0x2b04 ,0xffffffff ,0x00000000 ,0x2b03 ,0xffffffff ,0x32761054 ,0x2235 ,0x0000001f ,0x00000010 , -0x0570 ,0x000c0fc0 ,0x000c0400 +0x0570 ,0x000c0fc0 ,0x000c0400 , +0x052c ,0x0fffffff ,0xffffffff , +0x052d ,0x0fffffff ,0x0fffffff , +0x052e ,0x0fffffff ,0x0fffffff , +0x052f ,0x0fffffff ,0x0fffffff };static const u32 pitcairn_golden_rlc_registers[] = { +0x263e ,0xffffffff ,0x12011003 ,0x3109 ,0xffffffff ,0x00601004 ,0x311f ,0xffffffff ,0x10102020 , 0x3122, 0xffffffff, 0x01000020,
@@ -618,16 +624,16 @@ static const u32 pitcairn_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 , +0x000c ,0xffffffff ,0x0000001c , +0x000d ,0x000f0000 ,0x000f0000 , +0x0583 ,0xffffffff ,0x00000100 , +0x0409 ,0xffffffff ,0x00000100 , +0x040b ,0x00000101 ,0x00000000 , +0x082a ,0xffffffff ,0x00000104 ,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
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/9 drm/amdgpu: update rev id for pitcairn
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/si.c +1 -0
@@ -1212,6 +1212,7 @@ static int si_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_HDP_MGCG ; adev->pg_flags =0 ; + adev->external_rev_id = adev->rev_id +20 ;break ;case CHIP_VERDE :
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/9 drm/amdgpu: update golden setting for hainan
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +23 -14
@@ -380,22 +380,27 @@ static const u32 oland_golden_rlc_registers[] =static const u32 hainan_golden_registers[] = { +0x17bc ,0x00000030 ,0x00000011 ,0x2684 ,0x00010000 ,0x00018208 ,0x260c ,0xffffffff ,0x00000000 ,0x260d ,0xf00fffff ,0x00000400 ,0x260e ,0x0002021c ,0x00020200 , -0x4595 ,0xff000fff ,0x00000100 , +0x031e ,0x00000080 ,0x00000000 , +0x3430 ,0xff000fff ,0x00000100 ,0x340c ,0x000300c0 ,0x00800040 ,0x3630 ,0xff000fff ,0x00000100 ,0x360c ,0x000300c0 ,0x00800040 , +0x16ec ,0x000000f0 ,0x00000070 , +0x16f0 ,0x00200000 ,0x50100000 , +0x1c0c ,0x31000311 ,0x00000011 ,0x0ab9 ,0x00073ffe ,0x000022a2 ,0x0903 ,0x000007ff ,0x00000000 ,0x2285 ,0xf000001f ,0x00000007 ,0x22c9 ,0xffffffff ,0x00ffffff ,0x22c4 ,0x0000ff0f ,0x00000000 , -0xa393 ,0x07ffffff ,0x4e000000 , +0xa293 ,0x07ffffff ,0x4e000000 ,0xa0d4 ,0x3f3f3fff ,0x00000000 , -0x000c ,0x000000ff ,0x0040 , +0x000c ,0xffffffff ,0x0040 ,0x000d ,0x00000040 ,0x00004040 ,0x2440 ,0x03e00000 ,0x03600000 ,0x2418 ,0x0000007f ,0x00000020 ,
@@ -404,12 +409,16 @@ static const u32 hainan_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 hainan_golden_registers2[] = { -0x263e ,0xffffffff ,0x02010001 +0x263e ,0xffffffff ,0x2011003 }; static const u32 tahiti_mgcg_cgcg_init[] =
@@ -879,15 +888,15 @@ static const u32 hainan_mgcg_cgcg_init[] =0x21c2 ,0xffffffff ,0x00900100 ,0x311e ,0xffffffff ,0x00000080 ,0x3101 ,0xffffffff ,0x0020003f , -0xc ,0xffffffff ,0x0000001c , -0xd ,0x000f0000 ,0x000f0000 , -0x583 ,0xffffffff ,0x00000100 , -0x409 ,0xffffffff ,0x00000100 , -0x82a ,0xffffffff ,0x00000104 , -0x993 ,0x000c0000 ,0x000c0000 , -0x992 ,0x000c0000 ,0x000c0000 , -0xbd4 ,0x00000001 ,0x00000001 , -0xc33 ,0xc0000fff ,0x00000104 , +0x000c ,0xffffffff ,0x0000001c , +0x000d ,0x000f0000 ,0x000f0000 , +0x0583 ,0xffffffff ,0x00000100 , +0x0409 ,0xffffffff ,0x00000100 , +0x082a ,0xffffffff ,0x00000104 , +0x0993 ,0x000c0000 ,0x000c0000 , +0x0992 ,0x000c0000 ,0x000c0000 , +0x0bd4 ,0x00000001 ,0x00000001 , +0x0c33 ,0xc0000fff ,0x00000104 ,0x3079 ,0x00000001 ,0x00000001 ,0x3430 ,0xfffffff0 ,0x00000100 ,0x3630 ,0xfffffff0 ,0x00000100
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/9 drm/amdgpu: update rev id for hainan
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/si.c +1 -0
@@ -1279,6 +1279,7 @@ static int si_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_HDP_MGCG ; adev->pg_flags =0 ; + adev->external_rev_id =70 ;break ;default :
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/9 drm/amdgpu: update golden setting for oland
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +19 -13
@@ -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
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/9 drm/amdgpu: update rev id for oland
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/si.c +1 -0
@@ -1268,6 +1268,7 @@ static int si_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_HDP_MGCG ; adev->pg_flags =0 ; + adev->external_rev_id =60 ;break ;case CHIP_HAINAN : adev->cg_flags =
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/9 drm/amdgpu: update golden setting for verde
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 304 +++++++++++++++++++--------------------- 1 file changed, 142 insertions(+), 162 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +142 -162
@@ -145,133 +145,134 @@ static const u32 pitcairn_golden_rlc_registers[] =static const u32 verde_pg_init[] = { -0xd4f ,0xffffffff ,0x40000 , -0xd4e ,0xffffffff ,0x200010ff , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x7007 , -0xd4e ,0xffffffff ,0x300010ff , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x400000 , -0xd4e ,0xffffffff ,0x100010ff , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x120200 , -0xd4e ,0xffffffff ,0x500010ff , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x1e1e16 , -0xd4e ,0xffffffff ,0x600010ff , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x171f1e , -0xd4e ,0xffffffff ,0x700010ff , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4f ,0xffffffff ,0x0 , -0xd4e ,0xffffffff ,0x9ff , -0xd40 ,0xffffffff ,0x0 , -0xd41 ,0xffffffff ,0x10000800 , -0xd41 ,0xffffffff ,0xf , -0xd41 ,0xffffffff ,0xf , -0xd40 ,0xffffffff ,0x4 , -0xd41 ,0xffffffff ,0x1000051e , -0xd41 ,0xffffffff ,0xffff , -0xd41 ,0xffffffff ,0xffff , -0xd40 ,0xffffffff ,0x8 , -0xd41 ,0xffffffff ,0x80500 , -0xd40 ,0xffffffff ,0x12 , -0xd41 ,0xffffffff ,0x9050c , -0xd40 ,0xffffffff ,0x1d , -0xd41 ,0xffffffff ,0xb052c , -0xd40 ,0xffffffff ,0x2a , -0xd41 ,0xffffffff ,0x1053e , -0xd40 ,0xffffffff ,0x2d , -0xd41 ,0xffffffff ,0x10546 , -0xd40 ,0xffffffff ,0x30 , -0xd41 ,0xffffffff ,0xa054e , -0xd40 ,0xffffffff ,0x3c , -0xd41 ,0xffffffff ,0x1055f , -0xd40 ,0xffffffff ,0x3f , -0xd41 ,0xffffffff ,0x10567 , -0xd40 ,0xffffffff ,0x42 , -0xd41 ,0xffffffff ,0x1056f , -0xd40 ,0xffffffff ,0x45 , -0xd41 ,0xffffffff ,0x10572 , -0xd40 ,0xffffffff ,0x48 , -0xd41 ,0xffffffff ,0x20575 , -0xd40 ,0xffffffff ,0x4c , -0xd41 ,0xffffffff ,0x190801 , -0xd40 ,0xffffffff ,0x67 , -0xd41 ,0xffffffff ,0x1082a , -0xd40 ,0xffffffff ,0x6a , -0xd41 ,0xffffffff ,0x1b082d , -0xd40 ,0xffffffff ,0x87 , -0xd41 ,0xffffffff ,0x310851 , -0xd40 ,0xffffffff ,0xba , -0xd41 ,0xffffffff ,0x891 , -0xd40 ,0xffffffff ,0xbc , -0xd41 ,0xffffffff ,0x893 , -0xd40 ,0xffffffff ,0xbe , -0xd41 ,0xffffffff ,0x20895 , -0xd40 ,0xffffffff ,0xc2 , -0xd41 ,0xffffffff ,0x20899 , -0xd40 ,0xffffffff ,0xc6 , -0xd41 ,0xffffffff ,0x2089d , -0xd40 ,0xffffffff ,0xca , -0xd41 ,0xffffffff ,0x8a1 , -0xd40 ,0xffffffff ,0xcc , -0xd41 ,0xffffffff ,0x8a3 , -0xd40 ,0xffffffff ,0xce , -0xd41 ,0xffffffff ,0x308a5 , -0xd40 ,0xffffffff ,0xd3 , -0xd41 ,0xffffffff ,0x6d08cd , -0xd40 ,0xffffffff ,0x142 , -0xd41 ,0xffffffff ,0x2000095a , -0xd41 ,0xffffffff ,0x1 , -0xd40 ,0xffffffff ,0x144 , -0xd41 ,0xffffffff ,0x301f095b , -0xd40 ,0xffffffff ,0x165 , -0xd41 ,0xffffffff ,0xc094d , -0xd40 ,0xffffffff ,0x173 , -0xd41 ,0xffffffff ,0xf096d , -0xd40 ,0xffffffff ,0x184 , -0xd41 ,0xffffffff ,0x15097f , -0xd40 ,0xffffffff ,0x19b , -0xd41 ,0xffffffff ,0xc0998 , -0xd40 ,0xffffffff ,0x1a9 , -0xd41 ,0xffffffff ,0x409a7 , -0xd40 ,0xffffffff ,0x1af , -0xd41 ,0xffffffff ,0xcdc , -0xd40 ,0xffffffff ,0x1b1 , -0xd41 ,0xffffffff ,0x800 , -0xd42 ,0xffffffff ,0x6c9b2000 , -0xd44 ,0xfc00 ,0x2000 , -0xd51 ,0xffffffff ,0xfc0 , -0xa35 ,0x00000100 ,0x100 +0x0d4f ,0xffffffff ,0x40000 , +0x0d4e ,0xffffffff ,0x200010ff , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x7007 , +0x0d4e ,0xffffffff ,0x300010ff , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x400000 , +0x0d4e ,0xffffffff ,0x100010ff , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x120200 , +0x0d4e ,0xffffffff ,0x500010ff , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x1e1e16 , +0x0d4e ,0xffffffff ,0x600010ff , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x171f1e , +0x0d4e ,0xffffffff ,0x700010ff , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4f ,0xffffffff ,0x0 , +0x0d4e ,0xffffffff ,0x9ff , +0x0d40 ,0xffffffff ,0x0 , +0x0d41 ,0xffffffff ,0x10000800 , +0x0d41 ,0xffffffff ,0xf , +0x0d41 ,0xffffffff ,0xf , +0x0d40 ,0xffffffff ,0x4 , +0x0d41 ,0xffffffff ,0x1000051e , +0x0d41 ,0xffffffff ,0xffff , +0x0d41 ,0xffffffff ,0xffff , +0x0d40 ,0xffffffff ,0x8 , +0x0d41 ,0xffffffff ,0x80500 , +0x0d40 ,0xffffffff ,0x12 , +0x0d41 ,0xffffffff ,0x9050c , +0x0d40 ,0xffffffff ,0x1d , +0x0d41 ,0xffffffff ,0xb052c , +0x0d40 ,0xffffffff ,0x2a , +0x0d41 ,0xffffffff ,0x1053e , +0x0d40 ,0xffffffff ,0x2d , +0x0d41 ,0xffffffff ,0x10546 , +0x0d40 ,0xffffffff ,0x30 , +0x0d41 ,0xffffffff ,0xa054e , +0x0d40 ,0xffffffff ,0x3c , +0x0d41 ,0xffffffff ,0x1055f , +0x0d40 ,0xffffffff ,0x3f , +0x0d41 ,0xffffffff ,0x10567 , +0x0d40 ,0xffffffff ,0x42 , +0x0d41 ,0xffffffff ,0x1056f , +0x0d40 ,0xffffffff ,0x45 , +0x0d41 ,0xffffffff ,0x10572 , +0x0d40 ,0xffffffff ,0x48 , +0x0d41 ,0xffffffff ,0x20575 , +0x0d40 ,0xffffffff ,0x4c , +0x0d41 ,0xffffffff ,0x190801 , +0x0d40 ,0xffffffff ,0x67 , +0x0d41 ,0xffffffff ,0x1082a , +0x0d40 ,0xffffffff ,0x6a , +0x0d41 ,0xffffffff ,0x1b082d , +0x0d40 ,0xffffffff ,0x87 , +0x0d41 ,0xffffffff ,0x310851 , +0x0d40 ,0xffffffff ,0xba , +0x0d41 ,0xffffffff ,0x891 , +0x0d40 ,0xffffffff ,0xbc , +0x0d41 ,0xffffffff ,0x893 , +0x0d40 ,0xffffffff ,0xbe , +0x0d41 ,0xffffffff ,0x20895 , +0x0d40 ,0xffffffff ,0xc2 , +0x0d41 ,0xffffffff ,0x20899 , +0x0d40 ,0xffffffff ,0xc6 , +0x0d41 ,0xffffffff ,0x2089d , +0x0d40 ,0xffffffff ,0xca , +0x0d41 ,0xffffffff ,0x8a1 , +0x0d40 ,0xffffffff ,0xcc , +0x0d41 ,0xffffffff ,0x8a3 , +0x0d40 ,0xffffffff ,0xce , +0x0d41 ,0xffffffff ,0x308a5 , +0x0d40 ,0xffffffff ,0xd3 , +0x0d41 ,0xffffffff ,0x6d08cd , +0x0d40 ,0xffffffff ,0x142 , +0x0d41 ,0xffffffff ,0x2000095a , +0x0d41 ,0xffffffff ,0x1 , +0x0d40 ,0xffffffff ,0x144 , +0x0d41 ,0xffffffff ,0x301f095b , +0x0d40 ,0xffffffff ,0x165 , +0x0d41 ,0xffffffff ,0xc094d , +0x0d40 ,0xffffffff ,0x173 , +0x0d41 ,0xffffffff ,0xf096d , +0x0d40 ,0xffffffff ,0x184 , +0x0d41 ,0xffffffff ,0x15097f , +0x0d40 ,0xffffffff ,0x19b , +0x0d41 ,0xffffffff ,0xc0998 , +0x0d40 ,0xffffffff ,0x1a9 , +0x0d41 ,0xffffffff ,0x409a7 , +0x0d40 ,0xffffffff ,0x1af , +0x0d41 ,0xffffffff ,0xcdc , +0x0d40 ,0xffffffff ,0x1b1 , +0x0d41 ,0xffffffff ,0x800 , +0x0d42 ,0xffffffff ,0x6c9b2000 , +0x0d44 ,0xfc00 ,0x2000 , +0x0d51 ,0xffffffff ,0xfc0 , +0x0a35 ,0x00000100 ,0x100 };static const u32 verde_golden_rlc_registers[] = { +0x263e ,0xffffffff ,0x02010002 ,0x3109 ,0xffffffff ,0x033f1005 ,0x311f ,0xffffffff ,0x10808020 ,0x3122 ,0xffffffff ,0x00800008 ,
@@ -281,61 +282,40 @@ static const u32 verde_golden_rlc_registers[] =static const u32 verde_golden_registers[] = { +0x17bc ,0x00000030 ,0x00000011 ,0x2684 ,0x00010000 ,0x00018208 ,0x260c ,0xffffffff ,0x00000000 ,0x260d ,0xf00fffff ,0x00000400 ,0x260e ,0x0002021c ,0x00020200 ,0x031e ,0x00000080 ,0x00000000 ,0x340c ,0x000300c0 ,0x00800040 , -0x340c ,0x000300c0 ,0x00800040 , -0x360c ,0x000300c0 ,0x00800040 ,0x360c ,0x000300c0 ,0x00800040 ,0x16ec ,0x000000f0 ,0x00000070 ,0x16f0 ,0x00200000 ,0x50100000 , -0x1c0c ,0x31000311 ,0x00000011 ,0x0ab9 ,0x00073ffe ,0x000022a2 , -0x0ab9 ,0x00073ffe ,0x000022a2 , -0x0ab9 ,0x00073ffe ,0x000022a2 , -0x0903 ,0x000007ff ,0x00000000 , -0x0903 ,0x000007ff ,0x00000000 ,0x0903 ,0x000007ff ,0x00000000 ,0x2285 ,0xf000001f ,0x00000007 , -0x2285 ,0xf000001f ,0x00000007 , -0x2285 ,0xf000001f ,0x00000007 , -0x2285 ,0xffffffff ,0x00ffffff , +0x22c9 ,0xffffffff ,0x00ffffff ,0x22c4 ,0x0000ff0f ,0x00000000 , -0xa293 ,0x07ffffff ,0x4e000000 ,0xa0d4 ,0x3f3f3fff ,0x0000124a , -0xa0d4 ,0x3f3f3fff ,0x0000124a , -0xa0d4 ,0x3f3f3fff ,0x0000124a , -0x000c ,0x000000ff ,0x0040 , +0x000c ,0xffffffff ,0x0040 ,0x000d ,0x00000040 ,0x00004040 ,0x2440 ,0x07ffffff ,0x03000000 , -0x2440 ,0x07ffffff ,0x03000000 ,0x23a2 ,0x01ff1f3f ,0x00000000 , -0x23a3 ,0x01ff1f3f ,0x00000000 , -0x23a2 ,0x01ff1f3f ,0x00000000 , -0x23a1 ,0x01ff1f3f ,0x00000000 , -0x23a1 ,0x01ff1f3f ,0x00000000 , -0x23a1 ,0x01ff1f3f ,0x00000000 ,0x2418 ,0x0000007f ,0x00000020 ,0x2542 ,0x00010000 ,0x00010000 , -0x2b01 ,0x000003ff ,0x00000003 , -0x2b05 ,0x000003ff ,0x00000003 ,0x2b05 ,0x000003ff ,0x00000003 ,0x2b04 ,0xffffffff ,0x00000000 , -0x2b04 ,0xffffffff ,0x00000000 , -0x2b04 ,0xffffffff ,0x00000000 , -0x2b03 ,0xffffffff ,0x00001032 ,0x2b03 ,0xffffffff ,0x00001032 , -0x2b03 ,0xffffffff ,0x00001032 , -0x2235 ,0x0000001f ,0x00000010 , -0x2235 ,0x0000001f ,0x00000010 ,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_registers[] =
@@ -736,18 +716,18 @@ static const u32 verde_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
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/9 drm/amdgpu: update rev id for verde
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/si.c +1 -1
@@ -1229,7 +1229,7 @@ static int si_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_MGCG ; adev->pg_flags =0 ;//??? - adev->external_rev_id = adev->rev_id +0x14 ; + adev->external_rev_id = adev->rev_id +40 ;break ;case CHIP_OLAND : adev->cg_flags =
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1481787157-20840-9-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org
Zhang, Jerry
Reviewed-by Junwei ZhangRe: [PATCH 9/9] drm/amdgpu: update rev id for verde
Hi Flora,
Just confirm that it's decimal rather than HEX.
+ adev->external_rev_id = adev->rev_id + 40;
Apart from that, the series of patches looks good for me.
Regards,
Jerry(Junwei Zhang)
________________________________________
From: amd-gfx <[email protected]> on behalf of Flora Cui <[email protected]>
Sent: Thursday, December 15, 2016 3:32:37 PM
To: [email protected]
Cc: Cui, Flora
Subject: [PATCH 9/9] drm/amdgpu: update rev id for verde
--- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/si.c +1 -1
@@ -1229,7 +1229,7 @@ static int si_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_MGCG ; adev->pg_flags =0 ;//??? - adev->external_rev_id = adev->rev_id +0x14 ; + adev->external_rev_id = adev->rev_id +40 ;break ;case CHIP_OLAND : adev->cg_flags =
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 9/9] drm/amdgpu: update rev id for verde
In reply to a message not in the archiveQuoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Flora Cui
Sent: Thursday, December 15, 2016 2:33 AM
To: [email protected]
Cc: Cui, Flora
Subject: [PATCH 9/9] drm/amdgpu: update rev id for verdeChange-Id I9f2a140d635e9758f21a392ae2e976416de9453bSigned-off-by Flora Cui <[email protected]>
Series is:
Quoted 21 lines
--- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/si.c +1
-2@@ -1229,7 +1229,7 @@ static int si_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_MGCG ; adev->pg_flags =0 ;//??? - adev->external_rev_id = adev->rev_id +0x14 ; + adev->external_rev_id = adev->rev_id +40 ;break ;case CHIP_OLAND : adev->cg_flags = --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx