drm/amdgpu: update si kicker smc firmware
Subsystems (2)
PATCH 1/2 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): 1481781065-31701-1-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: update pitcairn golden setting
--- drivers/gpu/drm/amd/amdgpu/si.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +17 -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
@@ -1206,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
A message that is not in the archive (sent off-list or not yet received): 1481781065-31701-2-git-send-email-Flora.Cui-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 2/2] drm/amdgpu: update pitcairn golden setting
Hi Flora,
drivers/gpu/drm/amd/amdgpu/si.c static int si_common_early_init(void *handle) · line 1216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/si.c +1
-0@@ -1206,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 ;
It may be better to move into another patch regardless of golden setting.
BTW, it looks only VERDE has rev_id offset now. Do we need to add the offset for other chips about SI?
Regards,
Jerry (Junwei Zhang)
SRDC SW Development
AMD Shanghai
_____________________________________
Quoted 87 lines
(quoted diff) +0
-1-----Original Message-----From: amd-gfx [mailto:[email protected]] On Behalf Of Flora Cui
Sent: Thursday, December 15, 2016 13:51
To: [email protected]
Cc: Cui, Flora
Subject: [PATCH 2/2] drm/amdgpu: update pitcairn golden settingChange-Id Ie52b73ac3618174b71a1dfb5e0f152705f72c616Signed-off-by Flora Cui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/si.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/si.cindex 2439875..cf8a0a1 100644drivers/gpu/drm/amd/amdgpu/si.c +17
-11@@ -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 @@ -1206,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 : --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
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB182410B06573A46D0D4A4F24FF9D0-Gy0DoCVfaSWDAsAj5m+NkgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
RE: [PATCH 2/2] drm/amdgpu: update pitcairn golden setting
Yes. I'm working on this.
Regards,
Flora
-----Original Message-----
From: Zhang, Jerry
Sent: Thursday, December 15, 2016 2:43 PM
To: Cui, Flora <[email protected]>; [email protected]
Cc: Cui, Flora <[email protected]>
Subject: RE: [PATCH 2/2] drm/amdgpu: update pitcairn golden setting
Hi Flora,
drivers/gpu/drm/amd/amdgpu/si.c static int si_common_early_init(void *handle) · line 1216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/si.c +1
-0@@ -1206,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 ;
It may be better to move into another patch regardless of golden setting.
BTW, it looks only VERDE has rev_id offset now. Do we need to add the offset for other chips about SI?
Regards,
Jerry (Junwei Zhang)
SRDC SW Development
AMD Shanghai
_____________________________________
Quoted 87 lines
(quoted diff) +0
-1-----Original Message-----From: amd-gfx [mailto:[email protected]] On Behalf Of Flora Cui
Sent: Thursday, December 15, 2016 13:51
To: [email protected]
Cc: Cui, Flora
Subject: [PATCH 2/2] drm/amdgpu: update pitcairn golden settingChange-Id Ie52b73ac3618174b71a1dfb5e0f152705f72c616Signed-off-by Flora Cui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/si.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/si.cindex 2439875..cf8a0a1 100644drivers/gpu/drm/amd/amdgpu/si.c +17
-11@@ -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 @@ -1206,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 : --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