diff options
-rw-r--r-- | 0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch | 76 | ||||
-rw-r--r-- | kernel.spec | 6 |
2 files changed, 82 insertions, 0 deletions
diff --git a/0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch b/0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch new file mode 100644 index 000000000..836ce5050 --- /dev/null +++ b/0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch @@ -0,0 +1,76 @@ +From 61f007850bec83ef8b065c10833ad766a3b98d93 Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team <kernel-team@fedoraproject.org> +Date: Mon, 8 Oct 2018 16:50:35 -0500 +Subject: [PATCH] Revert drm/amd/pp: Send khz clock values to DC for smu7/8, it + shouldn't have been backported + +--- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++---- + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +index 77779ad..f8e866c 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +@@ -4555,12 +4555,12 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) + 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 * 10; ++ clocks->clock[i] = dep_sclk_table->entries[i].clk; + clocks->count = dep_sclk_table->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 * 10; ++ clocks->clock[i] = sclk_table->entries[i].clk; + clocks->count = sclk_table->count; + } + +@@ -4592,7 +4592,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) + 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 * 10; ++ clocks->clock[i] = dep_mclk_table->entries[i].clk; + clocks->latency[i] = smu7_get_mem_latency(hwmgr, + dep_mclk_table->entries[i].clk); + } +@@ -4600,7 +4600,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks) + } 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 * 10; ++ clocks->clock[i] = mclk_table->entries[i].clk; + clocks->count = mclk_table->count; + } + return 0; +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +index 0adfc53..617557b 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +@@ -1605,17 +1605,17 @@ static int smu8_get_clock_by_type(struct pp_hwmgr *hwmgr, enum amd_pp_clock_type + switch (type) { + case amd_pp_disp_clock: + for (i = 0; i < clocks->count; i++) +- clocks->clock[i] = data->sys_info.display_clock[i] * 10; ++ clocks->clock[i] = data->sys_info.display_clock[i]; + break; + case amd_pp_sys_clock: + table = hwmgr->dyn_state.vddc_dependency_on_sclk; + for (i = 0; i < clocks->count; i++) +- clocks->clock[i] = table->entries[i].clk * 10; ++ clocks->clock[i] = table->entries[i].clk; + break; + case amd_pp_mem_clock: + clocks->count = SMU8_NUM_NBPMEMORYCLOCK; + for (i = 0; i < clocks->count; i++) +- clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i] * 10; ++ clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i]; + break; + default: + return -1; +-- +2.17.1 + diff --git a/kernel.spec b/kernel.spec index fcb9bc2b1..e230abc9f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -627,6 +627,9 @@ Patch507: 0001-random-make-CPU-trust-a-boot-parameter.patch # rhbz 1634250 Patch510: HID-intel-ish-hid-Enable-Sunrise-Point-H-ish-driver.patch +#rhbz 1636249 +Patch511: 0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch + # END OF PATCH DEFINITIONS %endif @@ -1876,6 +1879,9 @@ fi # # %changelog +* Mon Oct 08 2018 Justin M. Forbes <jforbes@fedoraproject.org> +- Revert drm/amd/pp: Send khz clock values to DC for smu7/8 (rhbz 1636249) + * Thu Oct 04 2018 Laura Abbott <labbott@redhat.com> - 4.18.12-200 - Linux v4.18.12 |