AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: don't include the smu11 driver if header in smu v11 (v2)

Browse Source 
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 <ray.huang@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Huang Rui 2019-03-31 16:08:21 +08:00 committed by Alex Deucher
parent 6a36e3e57c
commit 013fd3a61a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/powerplay/inc/smu_11_0_driver_if.h → drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h
View File

@ -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

2
drivers/gpu/drm/amd/powerplay/navi10_ppt.c
View File

@ -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"

4
drivers/gpu/drm/amd/powerplay/smu_v11_0.c
View File

@ -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 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,
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)
{