drm/amd/powerplay: implement get_clock_by_type for iceland.
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: implement get_clock_by_type for iceland.
iceland use pptable v0.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 51 +++++++++++++++--------- 1 file changed, 33 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +33 -18
@@ -4243,18 +4243,26 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) {struct phm_ppt_v1_information *table_info = (struct phm_ppt_v1_information *)hwmgr->pptable; -struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table; +struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table =NULL ; +struct phm_clock_voltage_dependency_table *sclk_table;int i; -if (table_info ==NULL ) -return -EINVAL ; - - dep_sclk_table = table_info->vdd_dep_on_sclk; - -for (i =0 ; i < dep_sclk_table->count; i++) { - clocks->clock[i] = dep_sclk_table->entries[i].clk; - clocks->count++; +if (hwmgr->pp_table_version ==PP_TABLE_V1 ) { +if (table_info ==NULL || table_info->vdd_dep_on_sclk ==NULL ) +return -EINVAL ; + dep_sclk_table = table_info->vdd_dep_on_sclk; +for (i =0 ; i < dep_sclk_table->count; i++) { + clocks->clock[i] = dep_sclk_table->entries[i].clk; + clocks->count++; + } + }else if (hwmgr->pp_table_version ==PP_TABLE_V0 ) { + sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk; +for (i =0 ; i < sclk_table->count; i++) { + clocks->clock[i] = sclk_table->entries[i].clk; + clocks->count++; + } } +return 0 ; }
@@ -4276,17 +4284,24 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) (struct phm_ppt_v1_information *)hwmgr->pptable;struct phm_ppt_v1_clock_voltage_dependency_table *dep_mclk_table;int i; +struct phm_clock_voltage_dependency_table *mclk_table; -if (table_info ==NULL ) -return -EINVAL ; - - dep_mclk_table = table_info->vdd_dep_on_mclk; - -for (i =0 ; i < dep_mclk_table->count; i++) { - clocks->clock[i] = dep_mclk_table->entries[i].clk; - clocks->latency[i] =smu7_get_mem_latency (hwmgr, +if (hwmgr->pp_table_version ==PP_TABLE_V1 ) { +if (table_info ==NULL ) +return -EINVAL ; + dep_mclk_table = table_info->vdd_dep_on_mclk; +for (i =0 ; i < dep_mclk_table->count; i++) { + clocks->clock[i] = dep_mclk_table->entries[i].clk; + clocks->latency[i] =smu7_get_mem_latency (hwmgr, dep_mclk_table->entries[i].clk); - clocks->count++; + clocks->count++; + } + }else if (hwmgr->pp_table_version ==PP_TABLE_V0 ) { + mclk_table = hwmgr->dyn_state.vddc_dependency_on_mclk; +for (i =0 ; i < mclk_table->count; i++) { + clocks->clock[i] = mclk_table->entries[i].clk; + clocks->count++; + } }return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1478758054-10550-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Thursday, November 10, 2016 1:08 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: implementget_clock_by_typefor iceland.
Quoted 4 lines
iceland use pptable v0.
Change-Id Ifaf5dc081c76a014d97f80b8bde0a21003271dd5Signed-off-by Rex Zhu <[email protected]>
Quoted 91 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 51 +++++++++++++++--------- 1 file changed, 33 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +29
-18@@ -4243,18 +4243,26 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) {struct phm_ppt_v1_information *table_info = (struct phm_ppt_v1_information *)hwmgr->pptable; -struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table; +struct phm_ppt_v1_clock_voltage_dependency_table *dep_sclk_table =NULL ; +struct phm_clock_voltage_dependency_table *sclk_table;int i; -if (table_info ==NULL ) -return -EINVAL ; - - dep_sclk_table = table_info->vdd_dep_on_sclk; - -for (i =0 ; i < dep_sclk_table->count; i++) { - clocks->clock[i] = dep_sclk_table->entries[i].clk; - clocks->count++; +if (hwmgr->pp_table_version ==PP_TABLE_V1 ) { +if (table_info ==NULL || table_info->vdd_dep_on_sclk ==NULL ) +return -EINVAL ; + dep_sclk_table = table_info->vdd_dep_on_sclk; +for (i =0 ; i < dep_sclk_table->count; i++) { + clocks->clock[i] = dep_sclk_table->entries[i].clk; + clocks->count++; + } + }else if (hwmgr->pp_table_version ==PP_TABLE_V0 ) { + sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk; +for (i =0 ; i < sclk_table->count; i++) { + clocks->clock[i] = sclk_table->entries[i].clk; + clocks->count++; + } } +return 0 ; }@@ -4276,17 +4284,24 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) (struct phm_ppt_v1_information *)hwmgr->pptable;struct phm_ppt_v1_clock_voltage_dependency_table *dep_mclk_table;int i; +struct phm_clock_voltage_dependency_table *mclk_table; -if (table_info ==NULL ) -return -EINVAL ; - - dep_mclk_table = table_info->vdd_dep_on_mclk; - -for (i =0 ; i < dep_mclk_table->count; i++) { - clocks->clock[i] = dep_mclk_table->entries[i].clk; - clocks->latency[i] =smu7_get_mem_latency (hwmgr, +if (hwmgr->pp_table_version ==PP_TABLE_V1 ) { +if (table_info ==NULL ) +return -EINVAL ; + dep_mclk_table = table_info->vdd_dep_on_mclk; +for (i =0 ; i < dep_mclk_table->count; i++) { + clocks->clock[i] = dep_mclk_table->entries[i].clk; + clocks->latency[i] =smu7_get_mem_latency (hwmgr, dep_mclk_table- >entries[i].clk); - clocks->count++; + clocks->count++; + } + }else if (hwmgr->pp_table_version ==PP_TABLE_V0 ) { + mclk_table = hwmgr-Quoted 1 line
dyn_state.vddc_dependency_on_mclk;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +4
-1+for (i =0 ; i < mclk_table->count; i++) { + clocks->clock[i] = mclk_table->entries[i].clk; + clocks->count++; + } }return 0 ; } --1.9.1
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