Commit 013fd3a6 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher

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: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a36e3e5
#ifndef __SMU11_DRIVER_IF_H__ #ifndef __SMU11_DRIVER_IF_NAVI10_H__
#define __SMU11_DRIVER_IF_H__ #define __SMU11_DRIVER_IF_NAVI10_H__
// *** IMPORTANT *** // *** IMPORTANT ***
// SMU TEAM: Always increment the interface version if // SMU TEAM: Always increment the interface version if
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "atomfirmware.h" #include "atomfirmware.h"
#include "amdgpu_atomfirmware.h" #include "amdgpu_atomfirmware.h"
#include "smu_v11_0.h" #include "smu_v11_0.h"
#include "smu_11_0_driver_if.h" #include "smu11_driver_if_navi10.h"
#include "soc15_common.h" #include "soc15_common.h"
#include "atom.h" #include "atom.h"
#include "navi10_ppt.h" #include "navi10_ppt.h"
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "atomfirmware.h" #include "atomfirmware.h"
#include "amdgpu_atomfirmware.h" #include "amdgpu_atomfirmware.h"
#include "smu_v11_0.h" #include "smu_v11_0.h"
#include "smu_11_0_driver_if.h"
#include "soc15_common.h" #include "soc15_common.h"
#include "atom.h" #include "atom.h"
#include "vega20_ppt.h" #include "vega20_ppt.h"
...@@ -1739,6 +1738,9 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, ...@@ -1739,6 +1738,9 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
return ret; return ret;
} }
#define XGMI_STATE_D0 1
#define XGMI_STATE_D3 0
static int smu_v11_0_set_xgmi_pstate(struct smu_context *smu, static int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,
uint32_t pstate) uint32_t pstate)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment