summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchen gong <curry.gong@amd.com>2019-09-23 15:02:56 +0800
committerAlex Deucher <alexander.deucher@amd.com>2019-10-03 09:11:01 -0500
commit068ad870bbd8f4f2c5b2fd4977a4f3330c9988f4 (patch)
tree2a615c5a9d080cc29bf9a4083c1ee2ae9d0b0139
parent80f9bfe4e87910fe0a25566d6e25d13c7ae97283 (diff)
downloadlinux-stable-068ad870bbd8f4f2c5b2fd4977a4f3330c9988f4.tar.gz
linux-stable-068ad870bbd8f4f2c5b2fd4977a4f3330c9988f4.tar.bz2
linux-stable-068ad870bbd8f4f2c5b2fd4977a4f3330c9988f4.zip
drm/amd/powerplay: A workaround to GPU RESET on APU
Changes to function "smu_suspend" in amdgpu_smu.c is a workaround. We should get real information about if baco is enabled or not, while we always consider APU SMU feature as enabled in current code. I know APU do not support baco mode for GPU reset, so I use "adev->flags" to skip function "smu_feature_is_enabled". Signed-off-by: chen gong <curry.gong@amd.com> Reviewed-by: Aaron Liu <aaron.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/powerplay/amdgpu_smu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 90fa4448eddb..23293e15636b 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -1363,7 +1363,10 @@ static int smu_suspend(void *handle)
int ret;
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
struct smu_context *smu = &adev->smu;
- bool baco_feature_is_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT);
+ bool baco_feature_is_enabled = false;
+
+ if(!(adev->flags & AMD_IS_APU))
+ baco_feature_is_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT);
ret = smu_system_features_control(smu, false);
if (ret)