diff options
Diffstat (limited to 'queue-6.7/drm-amd-swsmu-modify-the-gfx-activity-scaling.patch')
| -rw-r--r-- | queue-6.7/drm-amd-swsmu-modify-the-gfx-activity-scaling.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/queue-6.7/drm-amd-swsmu-modify-the-gfx-activity-scaling.patch b/queue-6.7/drm-amd-swsmu-modify-the-gfx-activity-scaling.patch new file mode 100644 index 0000000000..6d9086df26 --- /dev/null +++ b/queue-6.7/drm-amd-swsmu-modify-the-gfx-activity-scaling.patch @@ -0,0 +1,48 @@ +From 6601c15c8a0680edb0d23a13151adb8023959149 Mon Sep 17 00:00:00 2001 +From: Li Ma <li.ma@amd.com> +Date: Wed, 28 Feb 2024 17:36:28 +0800 +Subject: drm/amd/swsmu: modify the gfx activity scaling + +From: Li Ma <li.ma@amd.com> + +commit 6601c15c8a0680edb0d23a13151adb8023959149 upstream. + +Add an if condition for gfx activity because the scaling has been changed after smu fw version 5d4600. +And remove a warning log. + +Signed-off-by: Li Ma <li.ma@amd.com> +Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +Cc: stable@vger.kernel.org # 6.7.x +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 -- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 5 ++++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +@@ -229,8 +229,6 @@ int smu_v14_0_check_fw_version(struct sm + smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_2; + break; + case IP_VERSION(14, 0, 0): +- if ((smu->smc_fw_version < 0x5d3a00)) +- dev_warn(smu->adev->dev, "The PMFW version(%x) is behind in this BIOS!\n", smu->smc_fw_version); + smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_0; + break; + default: +--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +@@ -261,7 +261,10 @@ static int smu_v14_0_0_get_smu_metrics_d + *value = metrics->MpipuclkFrequency; + break; + case METRICS_AVERAGE_GFXACTIVITY: +- *value = metrics->GfxActivity / 100; ++ if ((smu->smc_fw_version > 0x5d4600)) ++ *value = metrics->GfxActivity; ++ else ++ *value = metrics->GfxActivity / 100; + break; + case METRICS_AVERAGE_VCNACTIVITY: + *value = metrics->VcnActivity / 100; |