From 013fd3a61a827c65491b0bb9ad3c0417f09c8146 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sun, 31 Mar 2019 16:08:21 +0800 Subject: [PATCH] drm/amd/powerplay: don't include the smu11 driver if header in smu v11 (v2) This header is actually for each asic, so we should not include in smu_v11_0.c. And rename the one for navi10. v2: add hack for XGMI (Alex) Signed-off-by: Huang Rui Reviewed-by: Kevin Wang Reviewed-by: Alex Deucher Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- .../inc/{smu_11_0_driver_if.h => smu11_driver_if_navi10.h} | 4 ++-- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) rename drivers/gpu/drm/amd/powerplay/inc/{smu_11_0_driver_if.h => smu11_driver_if_navi10.h} (99%) diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_11_0_driver_if.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h similarity index 99% rename from drivers/gpu/drm/amd/powerplay/inc/smu_11_0_driver_if.h rename to drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h index 1ab6e4eca09f..25b7c8c496f7 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smu_11_0_driver_if.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h @@ -1,5 +1,5 @@ -#ifndef __SMU11_DRIVER_IF_H__ -#define __SMU11_DRIVER_IF_H__ +#ifndef __SMU11_DRIVER_IF_NAVI10_H__ +#define __SMU11_DRIVER_IF_NAVI10_H__ // *** IMPORTANT *** // SMU TEAM: Always increment the interface version if diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c index aaccf38920a7..d41763c54612 100644 --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c @@ -28,7 +28,7 @@ #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" -#include "smu_11_0_driver_if.h" +#include "smu11_driver_if_navi10.h" #include "soc15_common.h" #include "atom.h" #include "navi10_ppt.h" diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c index c11341c2ed98..21917762ae28 100644 --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c @@ -27,7 +27,6 @@ #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" -#include "smu_11_0_driver_if.h" #include "soc15_common.h" #include "atom.h" #include "vega20_ppt.h" @@ -1739,6 +1738,9 @@ set_fan_speed_rpm_failed: return ret; } +#define XGMI_STATE_D0 1 +#define XGMI_STATE_D3 0 + static int smu_v11_0_set_xgmi_pstate(struct smu_context *smu, uint32_t pstate) { -- 2.30.2