drm/amd/pm: correct the pcie link state check for SMU13
Subsystems (3)
PATCH 1/1 drm/amd/pm: correct the pcie link state check for SMU13
Update the driver implementations to fit those data exposed by PMFW.
Signed-off-by Evan Quan <[email protected]>
Change-Id I8579f6b22fb586bb52a6c97b8edfc13c493bd484
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 6 ++++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 ++-- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +6 -0
@@ -62,6 +62,12 @@#define CTF_OFFSET_HOTSPOT 5#define CTF_OFFSET_MEM 5 +static const int pmfw_decoded_link_speed[5 ] = {1 ,2 ,3 ,4 ,5 }; +static const int pmfw_decoded_link_width[7 ] = {0 ,1 ,2 ,4 ,8 ,12 ,16 }; + +#define DECODE_GEN_SPEED (gen_speed_idx) (pmfw_decoded_link_speed[gen_speed_idx]) +#define DECODE_LANE_WIDTH (lane_width_idx) (pmfw_decoded_link_width[lane_width_idx]) +struct smu_13_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +2 -2
@@ -1149,8 +1149,8 @@ static int smu_v13_0_0_print_clk_levels(struct smu_context *smu, (pcie_table->pcie_lane[i] ==5 ) ?"x12" : (pcie_table->pcie_lane[i] ==6 ) ?"x16" :"" , pcie_table->clk_freq[i], - ((gen_speed -1 ) == pcie_table->pcie_gen[i]) && - (lane_width == link_width[pcie_table->pcie_lane[i]]) ? + (gen_speed ==DECODE_GEN_SPEED (pcie_table->pcie_gen[i])) && + (lane_width ==DECODE_LANE_WIDTH (link_width[pcie_table->pcie_lane[i]])) ? "*" : "");break ;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +2 -2
@@ -1079,8 +1079,8 @@ static int smu_v13_0_7_print_clk_levels(struct smu_context *smu, (pcie_table->pcie_lane[i] ==5 ) ?"x12" : (pcie_table->pcie_lane[i] ==6 ) ?"x16" :"" , pcie_table->clk_freq[i], - (gen_speed == pcie_table->pcie_gen[i]) && - (lane_width == pcie_table->pcie_lane[i]) ? + (gen_speed ==DECODE_GEN_SPEED (pcie_table->pcie_gen[i])) && + (lane_width ==DECODE_LANE_WIDTH (pcie_table->pcie_lane[i])) ? "*" : "");break ;
Signature · 1 line
2.34.1
Quoted 5 lines · Evan Quan
Update the driver implementations to fit those data exposed by PMFW.
Signed-off-by Evan Quan <[email protected]>
Acked-by Alex Deucher <[email protected]>
Quoted 57 lines
Change-Id: I8579f6b22fb586bb52a6c97b8edfc13c493bd484
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 6 ++++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 ++-- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +6
-0@@ -62,6 +62,12 @@#define CTF_OFFSET_HOTSPOT 5#define CTF_OFFSET_MEM 5 +static const int pmfw_decoded_link_speed[5 ] = {1 ,2 ,3 ,4 ,5 }; +static const int pmfw_decoded_link_width[7 ] = {0 ,1 ,2 ,4 ,8 ,12 ,16 }; + +#define DECODE_GEN_SPEED (gen_speed_idx) (pmfw_decoded_link_speed[gen_speed_idx]) +#define DECODE_LANE_WIDTH (lane_width_idx) (pmfw_decoded_link_width[lane_width_idx]) +struct smu_13_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +2
-2@@ -1149,8 +1149,8 @@ static int smu_v13_0_0_print_clk_levels(struct smu_context *smu, (pcie_table->pcie_lane[i] ==5 ) ?"x12" : (pcie_table->pcie_lane[i] ==6 ) ?"x16" :"" , pcie_table->clk_freq[i], - ((gen_speed -1 ) == pcie_table->pcie_gen[i]) && - (lane_width == link_width[pcie_table->pcie_lane[i]]) ? + (gen_speed ==DECODE_GEN_SPEED (pcie_table->pcie_gen[i])) && + (lane_width ==DECODE_LANE_WIDTH (link_width[pcie_table->pcie_lane[i]])) ? "*" : "");break ;drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +2
-3@@ -1079,8 +1079,8 @@ static int smu_v13_0_7_print_clk_levels(struct smu_context *smu, (pcie_table->pcie_lane[i] ==5 ) ?"x12" : (pcie_table->pcie_lane[i] ==6 ) ?"x16" :"" , pcie_table->clk_freq[i], - (gen_speed == pcie_table->pcie_gen[i]) && - (lane_width == pcie_table->pcie_lane[i]) ? + (gen_speed ==DECODE_GEN_SPEED (pcie_table->pcie_gen[i])) && + (lane_width ==DECODE_LANE_WIDTH (pcie_table->pcie_lane[i])) ? "*" : "");break ; --2.34.1