drm/amdgpu: drop pitcairn dpm quirks
Subsystems (2)
PATCH 1/1 drm/amdgpu: drop pitcairn dpm quirks
No longer necessary with the new 58 mc ucode.
--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 47 +------------------------------------ 1 file changed, 1 insertion(+), 46 deletions(-)
drivers/gpu/drm/amd/amdgpu/si_dpm.c +1 -46
@@ -3009,29 +3009,6 @@ static int si_init_smc_spll_table(struct amdgpu_device *adev)return ret; } -struct si_dpm_quirk { -u32 chip_vendor; -u32 chip_device; -u32 subsys_vendor; -u32 subsys_device; -u32 max_sclk; -u32 max_mclk; -}; - -/* cards with dpm stability problems */ -static struct si_dpm_quirk si_dpm_quirk_list[] = { -/* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */ - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1462 ,0x3036 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0xe271 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x174b ,0xe271 ,85000 ,90000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1462 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1043 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x148c ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1682 ,0x9275 ,0 ,120000 }, - {0 ,0 ,0 ,0 }, -}; -static u16 si_get_lower_of_leakage_and_vce_voltage (struct amdgpu_device *adev,u16 vce_voltage) {
@@ -3477,18 +3454,8 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;u32 max_sclk =0 , max_mclk =0 ;int i; -struct si_dpm_quirk *p = si_dpm_quirk_list; -/* limit all SI kickers */ -if (adev->asic_type ==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 )) - max_mclk =120000 ; - }else if (adev->asic_type ==CHIP_HAINAN ) { +if (adev->asic_type ==CHIP_HAINAN ) { if ((adev->pdev->revision == 0x81) || (adev->pdev->revision == 0x83) || (adev->pdev->revision == 0xC3) ||
@@ -3498,18 +3465,6 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, max_sclk =75000 ; } } -/* Apply dpm quirks */ -while (p && p->chip_device !=0 ) { -if (adev->pdev->vendor == p->chip_vendor && - adev->pdev->device == p->chip_device && - adev->pdev->subsystem_vendor == p->subsys_vendor && - adev->pdev->subsystem_device == p->subsys_device) { - max_sclk = p->max_sclk; - max_mclk = p->max_mclk; -break ; - } - ++p; - }if (rps->vce_active) { rps->evclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].evclk;
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1485300416-3232-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 1/1 drm/radeon: drop pitcairn dpm quirks
No longer necessary with the new 58 mc ucode.
bug:
https://bugs.freedesktop.org/show_bug.cgi?id=76490
--- drivers/gpu/drm/radeon/si_dpm.c | 47 +---------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-)
drivers/gpu/drm/radeon/si_dpm.c +1 -46
@@ -2912,29 +2912,6 @@ static int si_init_smc_spll_table(struct radeon_device *rdev)return ret; } -struct si_dpm_quirk { -u32 chip_vendor; -u32 chip_device; -u32 subsys_vendor; -u32 subsys_device; -u32 max_sclk; -u32 max_mclk; -}; - -/* cards with dpm stability problems */ -static struct si_dpm_quirk si_dpm_quirk_list[] = { -/* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */ - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1462 ,0x3036 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0xe271 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x174b ,0xe271 ,85000 ,90000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1462 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1043 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x148c ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1682 ,0x9275 ,0 ,120000 }, - {0 ,0 ,0 ,0 }, -}; -static u16 si_get_lower_of_leakage_and_vce_voltage (struct radeon_device *rdev,u16 vce_voltage) {
@@ -2997,18 +2974,8 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev,u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;u32 max_sclk =0 , max_mclk =0 ;int i; -struct si_dpm_quirk *p = si_dpm_quirk_list; -/* limit all SI kickers */ -if (rdev->family ==CHIP_PITCAIRN ) { -if ((rdev->pdev->revision ==0x81 ) || - (rdev->pdev->device ==0x6810 ) || - (rdev->pdev->device ==0x6811 ) || - (rdev->pdev->device ==0x6816 ) || - (rdev->pdev->device ==0x6817 ) || - (rdev->pdev->device ==0x6806 )) - max_mclk =120000 ; - }else if (rdev->family ==CHIP_HAINAN ) { +if (rdev->family ==CHIP_HAINAN ) { if ((rdev->pdev->revision == 0x81) || (rdev->pdev->revision == 0x83) || (rdev->pdev->revision == 0xC3) ||
@@ -3018,18 +2985,6 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, max_sclk =75000 ; } } -/* Apply dpm quirks */ -while (p && p->chip_device !=0 ) { -if (rdev->pdev->vendor == p->chip_vendor && - rdev->pdev->device == p->chip_device && - rdev->pdev->subsystem_vendor == p->subsys_vendor && - rdev->pdev->subsystem_device == p->subsys_device) { - max_sclk = p->max_sclk; - max_mclk = p->max_mclk; -break ; - } - ++p; - }if (rps->vce_active) { rps->evclk = rdev->pm.dpm.vce_states[rdev->pm.dpm.vce_level].evclk;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 25.01.2017 um 00:26 schrieb Alex Deucher:
Quoted 3 lines
No longer necessary with the new 58 mc ucode.
Signed-off-by Alex Deucher <[email protected]>
Nice to have those finally resolved. Series is Reviewed-by: Christian König <[email protected]>.
Quoted 67 lines
--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 47 +------------------------------------ 1 file changed, 1 insertion(+), 46 deletions(-)drivers/gpu/drm/amd/amdgpu/si_dpm.c +1
-39@@ -3009,29 +3009,6 @@ static int si_init_smc_spll_table(struct amdgpu_device *adev)return ret; } -struct si_dpm_quirk { -u32 chip_vendor; -u32 chip_device; -u32 subsys_vendor; -u32 subsys_device; -u32 max_sclk; -u32 max_mclk; -}; - -/* cards with dpm stability problems */ -static struct si_dpm_quirk si_dpm_quirk_list[] = { -/* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */ - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1462 ,0x3036 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0xe271 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x174b ,0xe271 ,85000 ,90000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1462 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1043 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x148c ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1682 ,0x9275 ,0 ,120000 }, - {0 ,0 ,0 ,0 }, -}; -static u16 si_get_lower_of_leakage_and_vce_voltage (struct amdgpu_device *adev,u16 vce_voltage) {@@ -3477,18 +3454,8 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;u32 max_sclk =0 , max_mclk =0 ;int i; -struct si_dpm_quirk *p = si_dpm_quirk_list; -/* limit all SI kickers */ -if (adev->asic_type ==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 )) - max_mclk =120000 ; - }else if (adev->asic_type ==CHIP_HAINAN ) { +if (adev->asic_type ==CHIP_HAINAN ) { if ((adev->pdev->revision == 0x81) || (adev->pdev->revision == 0x83) || (adev->pdev->revision == 0xC3) ||@@ -3498,18 +3465,6 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, max_sclk =75000 ; } } -/* Apply dpm quirks */ -while (p && p->chip_device !=0 ) { - if (adev->pdev->vendor == p->chip_vendor && - adev->pdev->device == p->chip_device && - adev->pdev->subsystem_vendor == p->subsys_vendor &&
drivers/gpu/drm/amd/amdgpu/si_dpm.c static void si_apply_state_adjust_rules(struct amdgpu_device *adev, · line 3470
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-7- adev->pdev->subsystem_device == p->subsys_device) { - max_sclk = p->max_sclk; - max_mclk = p->max_mclk; -break ; - } - ++p; - }if (rps->vce_active) { rps->evclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].evclk;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 1 line · Alex Deucher
No longer necessary with the new 58 mc ucode.
Should this perhaps have a firmware version check? Would suck if somebody's system regressed if they upgrade the kernel but missed upgrading the firmware...
Nicolai
Quoted 70 lines
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 47 +------------------------------------ 1 file changed, 1 insertion(+), 46 deletions(-)drivers/gpu/drm/amd/amdgpu/si_dpm.c +1
-39@@ -3009,29 +3009,6 @@ static int si_init_smc_spll_table(struct amdgpu_device *adev)return ret; } -struct si_dpm_quirk { -u32 chip_vendor; -u32 chip_device; -u32 subsys_vendor; -u32 subsys_device; -u32 max_sclk; -u32 max_mclk; -}; - -/* cards with dpm stability problems */ -static struct si_dpm_quirk si_dpm_quirk_list[] = { -/* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */ - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1462 ,0x3036 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0xe271 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x174b ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x174b ,0xe271 ,85000 ,90000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1462 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x1043 ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6811 ,0x148c ,0x2015 ,0 ,120000 }, - {PCI_VENDOR_ID_ATI ,0x6810 ,0x1682 ,0x9275 ,0 ,120000 }, - {0 ,0 ,0 ,0 }, -}; -static u16 si_get_lower_of_leakage_and_vce_voltage (struct amdgpu_device *adev,u16 vce_voltage) {@@ -3477,18 +3454,8 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev,u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;u32 max_sclk =0 , max_mclk =0 ;int i; -struct si_dpm_quirk *p = si_dpm_quirk_list; -/* limit all SI kickers */ -if (adev->asic_type ==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 )) - max_mclk =120000 ; - }else if (adev->asic_type ==CHIP_HAINAN ) { +if (adev->asic_type ==CHIP_HAINAN ) { if ((adev->pdev->revision == 0x81) || (adev->pdev->revision == 0x83) || (adev->pdev->revision == 0xC3) ||@@ -3498,18 +3465,6 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, max_sclk =75000 ; } } -/* Apply dpm quirks */ -while (p && p->chip_device !=0 ) { - if (adev->pdev->vendor == p->chip_vendor && - adev->pdev->device == p->chip_device && - adev->pdev->subsystem_vendor == p->subsys_vendor &&
drivers/gpu/drm/amd/amdgpu/si_dpm.c static void si_apply_state_adjust_rules(struct amdgpu_device *adev, · line 3470
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-7- adev->pdev->subsystem_device == p->subsys_device) { - max_sclk = p->max_sclk; - max_mclk = p->max_mclk; -break ; - } - ++p; - }if (rps->vce_active) { rps->evclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].evclk;
_______________________________________________
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): a65e8192-c629-4404-5783-812cf040d354-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 7 lines
-----Original Message-----
From: Nicolai Hähnle [mailto:[email protected]]
Sent: Friday, January 27, 2017 3:19 PM
To: Alex Deucher; [email protected]
Cc: Deucher, Alexander
Subject: Re: [PATCH] drm/amdgpu: drop pitcairn dpm quirks
Quoted 6 lines
Quoted 1 line · Alex Deucher
No longer necessary with the new 58 mc ucode.
Should this perhaps have a firmware version check? Would suck if somebody's system regressed if they upgrade the kernel but missed upgrading the firmware...
The driver requires the new firmware so it won't load without it on affected systems.
Alex
Quoted 88 lines
Nicolai
Quoted 4 lines
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 47 +------------------------------------
Review
Quoted 3 lines
1 file changed, 1 insertion(+), 46 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/si_dpm.cdrivers/gpu/drm/amd/amdgpu/si_dpm.c static int si_init_smc_spll_table(struct
Quoted 4 lines
index 4f12da1..ab2dd59 100644
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-0@@ -3009,29 +3009,6 @@ static int si_init_smc_spll_table(struct
amdgpu_device*adev)Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-2return ret; } -struct si_dpm_quirk { -u32 chip_vendor;drivers/gpu/drm/amd/amdgpu/si_dpm.c static int si_init_smc_spll_table(struct amdgpu_device *adev)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-10-u32 chip_device; -u32 subsys_vendor; -u32 subsys_device; -u32 max_sclk; -u32 max_mclk; -}; - -/* cards with dpm stability problems */ -static struct si_dpm_quirk si_dpm_quirk_list[] = { -/* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */
drivers/gpu/drm/amd/amdgpu/si_dpm.c static int si_init_smc_spll_table(struct amdgpu_device *adev)
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-11- { PCI_VENDOR_ID_ATI, 0x6810, 0x1462, 0x3036, 0, 120000 }, - { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0xe271, 0, 120000 }, - { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0x2015, 0, 120000 }, - { PCI_VENDOR_ID_ATI, 0x6810, 0x174b, 0xe271, 85000, 90000 }, - { PCI_VENDOR_ID_ATI, 0x6811, 0x1462, 0x2015, 0, 120000 }, - { PCI_VENDOR_ID_ATI, 0x6811, 0x1043, 0x2015, 0, 120000 }, - { PCI_VENDOR_ID_ATI, 0x6811, 0x148c, 0x2015, 0, 120000 }, - { PCI_VENDOR_ID_ATI, 0x6810, 0x1682, 0x9275, 0, 120000 }, - { 0, 0, 0, 0 }, -}; - static u16 si_get_lower_of_leakage_and_vce_voltage(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/si_dpm.c static void si_apply_state_adjust_rules(struct
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-0u16 vce_voltage) {@@ -3477,18 +3454,8 @@ static void si_apply_state_adjust_rules(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/si_dpm.c static void si_apply_state_adjust_rules(struct
Quoted 20 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +1
-11u32 max_sclk_vddc, max_mclk_vddci, max_mclk_vddc;u32 max_sclk =0 , max_mclk =0 ;int i; -struct si_dpm_quirk *p = si_dpm_quirk_list; -/* limit all SI kickers */ -if (adev->asic_type ==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 )) - max_mclk =120000 ; - }else if (adev->asic_type ==CHIP_HAINAN ) { +if (adev->asic_type ==CHIP_HAINAN ) { if ((adev->pdev->revision == 0x81) || (adev->pdev->revision == 0x83) || (adev->pdev->revision == 0xC3) ||@@ -3498,18 +3465,6 @@ static void si_apply_state_adjust_rules(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/si_dpm.c static void si_apply_state_adjust_rules(struct amdgpu_device *adev,
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-5max_sclk =75000 ; } } -/* Apply dpm quirks */ -while (p && p->chip_device !=0 ) { -if (adev->pdev->vendor == p->chip_vendor && - adev->pdev->device == p->chip_device && - adev->pdev->subsystem_vendor == p->subsys_vendor&&
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-7- adev->pdev->subsystem_device == p->subsys_device) { - max_sclk = p->max_sclk; - max_mclk = p->max_mclk; -break ; - } - ++p; - }
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/si_dpm.c +0
-0if (rps->vce_active) { rps->evclk = adev->pm.dpm.vce_states[adev-pm.dpm.vce_level].evclk;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx