Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 19:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/powerplay: drop unnecessary message support check(v2)

Browse Source 
Take back patch:drop unnecessary message support check
Because the gpu reset fail problem on renoir can be fixed by:
drm/amd/powerplay: skip invalid msg when smu set mp1 state
It needs to remove SWSMU_CODE_LAYER_L1 in smu_cmn.h to guard a clear
code layer.

Signed-off-by: changfeng <Changfeng.Zhu@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Changfeng 2020-07-24 13:15:10 +08:00 committed by Alex Deucher
parent bbf16f530c
commit de273b73ca
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
View File

@ -34,7 +34,6 @@
#include "sienna_cichlid_ppt.h" #include "sienna_cichlid_ppt.h"
#include "renoir_ppt.h" #include "renoir_ppt.h"
#include "amd_pcie.h" #include "amd_pcie.h"
#include "smu_cmn.h"
/* /*
* DO NOT use these for err/warn/info/debug messages. * DO NOT use these for err/warn/info/debug messages.
@ -1590,14 +1589,6 @@ int smu_set_mp1_state(struct smu_context *smu,
return 0; return 0;
} }
/* some asics may not support those messages */
if (smu_cmn_to_asic_specific_index(smu,
CMN2ASIC_MAPPING_MSG,
msg) < 0) {
mutex_unlock(&smu->mutex);
return 0;
}
ret = smu_send_smc_msg(smu, msg, NULL); ret = smu_send_smc_msg(smu, msg, NULL);
/* some asics may not support those messages */ /* some asics may not support those messages */
if (ret == -EINVAL) if (ret == -EINVAL)

2
drivers/gpu/drm/amd/powerplay/smu_cmn.h
View File

@ -25,7 +25,7 @@
#include "amdgpu_smu.h" #include "amdgpu_smu.h"
#if defined(SWSMU_CODE_LAYER_L1) || defined(SWSMU_CODE_LAYER_L2) || defined(SWSMU_CODE_LAYER_L3) || defined(SWSMU_CODE_LAYER_L4) #if defined(SWSMU_CODE_LAYER_L2) || defined(SWSMU_CODE_LAYER_L3) || defined(SWSMU_CODE_LAYER_L4)
int smu_cmn_send_smc_msg_with_param(struct smu_context *smu, int smu_cmn_send_smc_msg_with_param(struct smu_context *smu,
enum smu_message_type msg, enum smu_message_type msg,
uint32_t param, uint32_t param,