drm/amd/powerplay: drop redundant BIF doorbell interrupt operations
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: drop redundant BIF doorbell interrupt operations
This is already done in soc15.c. And this is really ASIC specific and should not be placed here.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0 -14
@@ -1700,11 +1700,9 @@ enum smu_baco_state smu_v11_0_baco_get_state(struct smu_context *smu)int smu_v11_0_baco_set_state (struct smu_context *smu,enum smu_baco_state state) { -struct smu_baco_context *smu_baco = &smu->smu_baco;struct amdgpu_device *adev = smu->adev;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); -uint32_t bif_doorbell_intr_cntl;uint32_t data;int ret =0 ;
@@ -1713,14 +1711,7 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)mutex_lock (&smu_baco->mutex); - bif_doorbell_intr_cntl =RREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL); -if (state ==SMU_BACO_STATE_ENTER ) { - bif_doorbell_intr_cntl =REG_SET_FIELD (bif_doorbell_intr_cntl, -BIF_DOORBELL_INT_CNTL , -DOORBELL_INTERRUPT_DISABLE ,1 ); -WREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl); -if (!ras || !ras->supported) { data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); data |=0x80000000 ;
@@ -1741,11 +1732,6 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) goto out; } - bif_doorbell_intr_cntl =REG_SET_FIELD (bif_doorbell_intr_cntl, -BIF_DOORBELL_INT_CNTL , -DOORBELL_INTERRUPT_DISABLE ,0 ); -WREG32_SOC15 (NBIO ,0 , mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl); -/* clear vbios scratch 6 and 7 for coming asic reinit */ WREG32 (adev->bios_scratch_reg_offset +6 ,0 );WREG32 (adev->bios_scratch_reg_offset +7 ,0 );
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/powerplay: move the ASIC specific nbio operation out of smu_v11_0.c
This is ASIC specific and should be placed in _ppt.c of each ASIC.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 15 ++++++++++++++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 18 ++++++++++++++++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 10 +--------- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 14 +++++++++++++- 4 files changed, 44 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +14 -1
@@ -35,6 +35,7 @@#include "arcturus_ppt.h" #include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h" +#include "nbio/nbio_7_4_offset.h" #include "nbio/nbio_7_4_sh_mask.h" #include "amdgpu_xgmi.h" #include <linux/i2c.h>
@@ -2210,6 +2211,18 @@ static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)i2c_del_adapter (control); } +static bool arcturus_is_baco_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; + +if (!smu_v11_0_baco_is_support (smu)) +return false; + + val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); +return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; +} +static uint32_t arcturus_get_pptable_power_limit (struct smu_context *smu) {PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -2321,7 +2334,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .register_irq_handler = smu_v11_0_register_irq_handler, .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, + .baco_is_support= arcturus_is_baco_supported, .baco_get_state = smu_v11_0_baco_get_state, .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +16 -2
@@ -28,13 +28,15 @@#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" +#include "soc15_common.h" #include "smu_v11_0.h" #include "smu11_driver_if_navi10.h" #include "atom.h" #include "navi10_ppt.h" #include "smu_v11_0_pptable.h" #include "smu_v11_0_ppsmc.h" -#include "nbio/nbio_7_4_sh_mask.h" +#include "nbio/nbio_2_3_offset.h" +#include "nbio/nbio_2_3_sh_mask.h" #include "asic_reg/mp/mp_11_0_sh_mask.h"
@@ -1942,6 +1944,18 @@ static int navi10_setup_od_limits(struct smu_context *smu) {return 0 ; } +static bool navi10_is_baco_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; + +if (!smu_v11_0_baco_is_support (smu)) +return false; + + val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); +return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; +} +static int navi10_set_default_od_settings (struct smu_context *smu,bool initialize) {OverDriveTable_t *od_table, *boot_od_table;int ret =0 ;
@@ -2318,7 +2332,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .register_irq_handler = smu_v11_0_register_irq_handler, .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, + .baco_is_support= navi10_is_baco_supported, .baco_get_state = smu_v11_0_baco_get_state, .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter,
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -9
@@ -42,8 +42,6 @@#include "asic_reg/thm/thm_11_0_2_sh_mask.h" #include "asic_reg/mp/mp_11_0_offset.h" #include "asic_reg/mp/mp_11_0_sh_mask.h" -#include "asic_reg/nbio/nbio_7_4_offset.h" -#include "asic_reg/nbio/nbio_7_4_sh_mask.h" #include "asic_reg/smuio/smuio_11_0_0_offset.h" #include "asic_reg/smuio/smuio_11_0_0_sh_mask.h"
@@ -1662,9 +1660,7 @@ static int smu_v11_0_baco_set_armd3_sequence(struct smu_context *smu, enum smu_vbool smu_v11_0_baco_is_support (struct smu_context *smu) { -struct amdgpu_device *adev = smu->adev;struct smu_baco_context *smu_baco = &smu->smu_baco; -uint32_t val;bool baco_support;mutex_lock (&smu_baco->mutex);
@@ -1679,11 +1675,7 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu) !smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT))return false; - val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); -if (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) -return true; - -return false; +return true; }enum smu_baco_state smu_v11_0_baco_get_state (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +13 -1
@@ -35,6 +35,7 @@#include "vega20_ppt.h" #include "vega20_pptable.h" #include "vega20_ppsmc.h" +#include "nbio/nbio_7_4_offset.h" #include "nbio/nbio_7_4_sh_mask.h" #include "asic_reg/thm/thm_11_0_2_offset.h" #include "asic_reg/thm/thm_11_0_2_sh_mask.h"
@@ -3174,6 +3175,17 @@ static int vega20_update_pcie_parameters(struct smu_context *smu,return ret; } +static bool vega20_is_baco_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; + +if (!smu_v11_0_baco_is_support (smu)) +return false; + + val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); +return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; +}static const struct pptable_funcs vega20_ppt_funcs = { .tables_init = vega20_tables_init,
@@ -3262,7 +3274,7 @@ static const struct pptable_funcs vega20_ppt_funcs = { .register_irq_handler = smu_v11_0_register_irq_handler, .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, + .baco_is_support= vega20_is_baco_supported, .baco_get_state = smu_v11_0_baco_get_state, .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter,
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amd/powerplay: move the ASIC specific nbio operation out of smu_v11_0.c
[AMD Public Use]
Series is:
________________________________
From: amd-gfx <[email protected]> on behalf of Evan Quan <[email protected]>
Sent: Friday, March 27, 2020 3:57 AM
To: [email protected] <[email protected]>
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 2/2] drm/amd/powerplay: move the ASIC specific nbio operation out of smu_v11_0.c
This is ASIC specific and should be placed in _ppt.c of each ASIC.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 15 ++++++++++++++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 18 ++++++++++++++++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 10 +--------- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 14 +++++++++++++- 4 files changed, 44 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +14 -1
@@ -35,6 +35,7 @@#include "arcturus_ppt.h" #include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h" +#include "nbio/nbio_7_4_offset.h" #include "nbio/nbio_7_4_sh_mask.h" #include "amdgpu_xgmi.h" #include <linux/i2c.h>
@@ -2210,6 +2211,18 @@ static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)i2c_del_adapter (control); } +static bool arcturus_is_baco_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; + +if (!smu_v11_0_baco_is_support (smu)) +return false; + + val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); +return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; +} +static uint32_t arcturus_get_pptable_power_limit (struct smu_context *smu) {PPTable_t *pptable = smu->smu_table.driver_pptable;
@@ -2321,7 +2334,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .register_irq_handler = smu_v11_0_register_irq_handler, .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, + .baco_is_support= arcturus_is_baco_supported, .baco_get_state = smu_v11_0_baco_get_state, .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +16 -2
@@ -28,13 +28,15 @@#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" +#include "soc15_common.h" #include "smu_v11_0.h" #include "smu11_driver_if_navi10.h" #include "atom.h" #include "navi10_ppt.h" #include "smu_v11_0_pptable.h" #include "smu_v11_0_ppsmc.h" -#include "nbio/nbio_7_4_sh_mask.h" +#include "nbio/nbio_2_3_offset.h" +#include "nbio/nbio_2_3_sh_mask.h" #include "asic_reg/mp/mp_11_0_sh_mask.h"
@@ -1942,6 +1944,18 @@ static int navi10_setup_od_limits(struct smu_context *smu) {return 0 ; } +static bool navi10_is_baco_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; + +if (!smu_v11_0_baco_is_support (smu)) +return false; + + val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); +return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; +} +static int navi10_set_default_od_settings (struct smu_context *smu,bool initialize) {OverDriveTable_t *od_table, *boot_od_table;int ret =0 ;
@@ -2318,7 +2332,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .register_irq_handler = smu_v11_0_register_irq_handler, .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, + .baco_is_support= navi10_is_baco_supported, .baco_get_state = smu_v11_0_baco_get_state, .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter,
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -9
@@ -42,8 +42,6 @@#include "asic_reg/thm/thm_11_0_2_sh_mask.h" #include "asic_reg/mp/mp_11_0_offset.h" #include "asic_reg/mp/mp_11_0_sh_mask.h" -#include "asic_reg/nbio/nbio_7_4_offset.h" -#include "asic_reg/nbio/nbio_7_4_sh_mask.h" #include "asic_reg/smuio/smuio_11_0_0_offset.h" #include "asic_reg/smuio/smuio_11_0_0_sh_mask.h"
@@ -1662,9 +1660,7 @@ static int smu_v11_0_baco_set_armd3_sequence(struct smu_context *smu, enum smu_vbool smu_v11_0_baco_is_support (struct smu_context *smu) { -struct amdgpu_device *adev = smu->adev;struct smu_baco_context *smu_baco = &smu->smu_baco; -uint32_t val;bool baco_support;mutex_lock (&smu_baco->mutex);
@@ -1679,11 +1675,7 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu) !smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT))return false; - val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); -if (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) -return true; - -return false; +return true; }enum smu_baco_state smu_v11_0_baco_get_state (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +13 -1
@@ -35,6 +35,7 @@#include "vega20_ppt.h" #include "vega20_pptable.h" #include "vega20_ppsmc.h" +#include "nbio/nbio_7_4_offset.h" #include "nbio/nbio_7_4_sh_mask.h" #include "asic_reg/thm/thm_11_0_2_offset.h" #include "asic_reg/thm/thm_11_0_2_sh_mask.h"
@@ -3174,6 +3175,17 @@ static int vega20_update_pcie_parameters(struct smu_context *smu,return ret; } +static bool vega20_is_baco_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; + +if (!smu_v11_0_baco_is_support (smu)) +return false; + + val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0); +return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; +}static const struct pptable_funcs vega20_ppt_funcs = { .tables_init = vega20_tables_init,
@@ -3262,7 +3274,7 @@ static const struct pptable_funcs vega20_ppt_funcs = { .register_irq_handler = smu_v11_0_register_irq_handler, .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, + .baco_is_support= vega20_is_baco_supported, .baco_get_state = smu_v11_0_baco_get_state, .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter,
--
2.26.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Calexander.deucher%40amd.com%7Ccb038ac52dd74c4deb8b08d7d2247db2%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637208926495509214&sdata=RWdMDhBZwNdo5bjDkf1RQXahEuulClXOCtwKD5i3fmw%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx