This is a note to let you know that I've just added the patch titled
drm/amdgpu/smu13: drop compute workload workaround
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-smu13-drop-compute-workload-workaround.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 23170863ea0a0965d224342c0eb2ad8303b1f267 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Wed, 1 Nov 2023 15:48:14 -0400
Subject: drm/amdgpu/smu13: drop compute workload workaround
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 23170863ea0a0965d224342c0eb2ad8303b1f267 upstream.
This was fixed in PMFW before launch and is no longer
required.
Reviewed-by: Yang Wang <kevinyang.wang@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 6.1.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 32 +------------------
1 file changed, 2 insertions(+), 30 deletions(-)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -1645,38 +1645,10 @@ static int smu_v13_0_0_set_power_profile
}
}
- if (smu->power_profile_mode == PP_SMC_POWER_PROFILE_COMPUTE &&
- (((smu->adev->pdev->device == 0x744C) && (smu->adev->pdev->revision == 0xC8)) ||
- ((smu->adev->pdev->device == 0x744C) && (smu->adev->pdev->revision == 0xCC)))) {
- ret = smu_cmn_update_table(smu,
- SMU_TABLE_ACTIVITY_MONITOR_COEFF,
- WORKLOAD_PPLIB_COMPUTE_BIT,
- (void *)(&activity_monitor_external),
- false);
- if (ret) {
- dev_err(smu->adev->dev, "[%s] Failed to get activity monitor!", __func__);
- return ret;
- }
-
- ret = smu_cmn_update_table(smu,
- SMU_TABLE_ACTIVITY_MONITOR_COEFF,
- WORKLOAD_PPLIB_CUSTOM_BIT,
- (void *)(&activity_monitor_external),
- true);
- if (ret) {
- dev_err(smu->adev->dev, "[%s] Failed to set activity monitor!", __func__);
- return ret;
- }
-
- workload_type = smu_cmn_to_asic_specific_index(smu,
- CMN2ASIC_MAPPING_WORKLOAD,
- PP_SMC_POWER_PROFILE_CUSTOM);
- } else {
- /* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
- workload_type = smu_cmn_to_asic_specific_index(smu,
+ /* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
+ workload_type = smu_cmn_to_asic_specific_index(smu,
CMN2ASIC_MAPPING_WORKLOAD,
smu->power_profile_mode);
- }
if (workload_type < 0)
return -EINVAL;
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.1/drm-amd-pm-fix-error-of-maco-flag-setting-code.patch
queue-6.1/drm-amd-display-use-full-update-for-clip-size-increa.patch
queue-6.1/drm-radeon-fix-a-possible-null-pointer-dereference.patch
queue-6.1/drm-amdkfd-fix-shift-out-of-bounds-issue.patch
queue-6.1/drm-amdgpu-not-to-save-bo-in-the-case-of-ras-err_eve.patch
queue-6.1/drm-amdgpu-lower-cs-errors-to-debug-severity.patch
queue-6.1/drm-amdgpu-fix-a-null-pointer-access-when-the-smc_rr.patch
queue-6.1/drm-amd-update-update_pcie_parameters-functions-to-u.patch
queue-6.1/drm-amd-pm-handle-non-terminated-overdrive-commands.patch
queue-6.1/drm-amd-display-enable-dsc_clk-even-if-dsc_pg-disabl.patch
queue-6.1/drm-amdgpu-vkms-fix-a-possible-null-pointer-derefere.patch
queue-6.1/drm-amd-display-change-the-dmcub-mailbox-memory-location-from-fb-to-inbox.patch
queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-smu7.patch
queue-6.1/drm-amdgpu-don-t-use-pci_is_thunderbolt_attached.patch
queue-6.1/drm-amd-display-fix-a-null-pointer-dereference-in-amdgpu_dm_i2c_xfer.patch
queue-6.1/drm-amdgpu-don-t-use-atrm-for-external-devices.patch
queue-6.1/drm-amdkfd-fix-a-race-condition-of-vram-buffer-unref.patch
queue-6.1/drm-amdgpu-fix-software-pci_unplug-on-some-chips.patch
queue-6.1/drm-amd-display-enable-fast-plane-updates-on-dcn3.2-and-above.patch
queue-6.1/drm-amdgpu-fix-potential-null-pointer-derefernce.patch
queue-6.1/drm-amd-display-avoid-null-dereference-of-timing-gen.patch
queue-6.1/drm-amd-fix-ubsan-array-index-out-of-bounds-for-pola.patch
queue-6.1/drm-amdgpu-smu13-drop-compute-workload-workaround.patch
queue-6.1/drm-amdgpu-fix-error-handling-in-amdgpu_bo_list_get.patch
