drm/amd/pm: revise the ASPM settings for thunderbolt attached scenario
Subsystems (2)
PATCH 1/2 drm/amd/pm: revise the ASPM settings for thunderbolt attached scenario
Also, correct the comment for NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT as 0x0000000E stands for 400ms instead of 4ms.
Signed-off-by Evan Quan <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +7 -4
@@ -346,7 +346,7 @@ static void nbio_v2_3_init_registers(struct amdgpu_device *adev)#define NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT 0x00000000 // off by default, no gains over L1#define NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT 0x00000009 // 1=1us, 9=1ms -#define NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT 0x0000000E // 4ms +#define NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT 0x0000000E // 400msstatic void nbio_v2_3_enable_aspm (struct amdgpu_device *adev,bool enable)
@@ -479,9 +479,12 @@ static void nbio_v2_3_program_aspm(struct amdgpu_device *adev)WREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP5, data); def = data =RREG32_PCIE (smnPCIE_LC_CNTL); - data &= ~PCIE_LC_CNTL__LC_L0S_INACTIVITY_MASK ; - data |=0x9 <<PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT ; - data |=0x1 <<PCIE_LC_CNTL__LC_PMI_TO_L1_DIS__SHIFT ; + data |=NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT <<PCIE_LC_CNTL__LC_L0S_INACTIVITY__SHIFT ; +if (pci_is_thunderbolt_attached (adev->pdev)) + data |=NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT <<PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT ; +else + data |=NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT <<PCIE_LC_CNTL__LC_L1_INACTIVITY__SHIFT ; + data &= ~PCIE_LC_CNTL__LC_PMI_TO_L1_DIS_MASK ;if (def != data)WREG32_PCIE (smnPCIE_LC_CNTL, data);
Signature · 1 line
2.34.1
PATCH 2/2 drm/amd/pm: update the LC_L1_INACTIIVY setting to address possible noise issue
It is proved that insufficient LC_L1_INACTIIVY setting can cause audio noise on some platform. With the LC_L1_INACTIIVY increased to 4ms, the issue can be resolved.
Signed-off-by Evan Quan <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +1 -1
@@ -345,7 +345,7 @@ static void nbio_v2_3_init_registers(struct amdgpu_device *adev) }#define NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT 0x00000000 // off by default, no gains over L1 -#define NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT 0x00000009 // 1=1us, 9=1ms +#define NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT 0x0000000A // 1=1us, 9=1ms, 10=4ms#define NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT 0x0000000E // 400ms static void nbio_v2_3_enable_aspm(struct amdgpu_device *adev,
Signature · 1 line
2.34.1
Re: [PATCH 2/2] drm/amd/pm: update the LC_L1_INACTIIVY setting to address possible noise issue
Series is:
Reviewed-by Alex Deucher <[email protected]>
Quoted 26 lines · Evan Quan
It is proved that insufficient
LC_L1_INACTIIVYsetting can cause audio noise on some platform. With theLC_L1_INACTIIVYincreased to 4ms, the issue can be resolved.Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c +1
-2@@ -345,7 +345,7 @@ static void nbio_v2_3_init_registers(struct amdgpu_device *adev) }#define NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT 0x00000000 // off by default, no gains over L1 -#define NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT 0x00000009 // 1=1us, 9=1ms +#define NAVI10_PCIE__LC_L1_INACTIVITY_DEFAULT 0x0000000A // 1=1us, 9=1ms, 10=4ms#define NAVI10_PCIE__LC_L1_INACTIVITY_TBT_DEFAULT 0x0000000E // 400ms static void nbio_v2_3_enable_aspm(struct amdgpu_device *adev, --2.34.1