Commit d93eb053 authored by GuoHua Chen's avatar GuoHua Chen Committed by Alex Deucher

drm/radeon: Clean up errors in smu7_discrete.h

Fix the following errors reported by checkpatch:

ERROR: open brace '{' following struct go on the same line
Signed-off-by: default avatarGuoHua Chen <chenguohua_716@163.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 007cded6
...@@ -35,8 +35,7 @@ ...@@ -35,8 +35,7 @@
#define SMU7_NUM_GPU_TES 1 #define SMU7_NUM_GPU_TES 1
#define SMU7_NUM_NON_TES 2 #define SMU7_NUM_NON_TES 2
struct SMU7_SoftRegisters struct SMU7_SoftRegisters {
{
uint32_t RefClockFrequency; uint32_t RefClockFrequency;
uint32_t PmTimerP; uint32_t PmTimerP;
uint32_t FeatureEnables; uint32_t FeatureEnables;
...@@ -89,8 +88,7 @@ struct SMU7_SoftRegisters ...@@ -89,8 +88,7 @@ struct SMU7_SoftRegisters
typedef struct SMU7_SoftRegisters SMU7_SoftRegisters; typedef struct SMU7_SoftRegisters SMU7_SoftRegisters;
struct SMU7_Discrete_VoltageLevel struct SMU7_Discrete_VoltageLevel {
{
uint16_t Voltage; uint16_t Voltage;
uint16_t StdVoltageHiSidd; uint16_t StdVoltageHiSidd;
uint16_t StdVoltageLoSidd; uint16_t StdVoltageLoSidd;
...@@ -100,8 +98,7 @@ struct SMU7_Discrete_VoltageLevel ...@@ -100,8 +98,7 @@ struct SMU7_Discrete_VoltageLevel
typedef struct SMU7_Discrete_VoltageLevel SMU7_Discrete_VoltageLevel; typedef struct SMU7_Discrete_VoltageLevel SMU7_Discrete_VoltageLevel;
struct SMU7_Discrete_GraphicsLevel struct SMU7_Discrete_GraphicsLevel {
{
uint32_t Flags; uint32_t Flags;
uint32_t MinVddc; uint32_t MinVddc;
uint32_t MinVddcPhases; uint32_t MinVddcPhases;
...@@ -131,8 +128,7 @@ struct SMU7_Discrete_GraphicsLevel ...@@ -131,8 +128,7 @@ struct SMU7_Discrete_GraphicsLevel
typedef struct SMU7_Discrete_GraphicsLevel SMU7_Discrete_GraphicsLevel; typedef struct SMU7_Discrete_GraphicsLevel SMU7_Discrete_GraphicsLevel;
struct SMU7_Discrete_ACPILevel struct SMU7_Discrete_ACPILevel {
{
uint32_t Flags; uint32_t Flags;
uint32_t MinVddc; uint32_t MinVddc;
uint32_t MinVddcPhases; uint32_t MinVddcPhases;
...@@ -153,8 +149,7 @@ struct SMU7_Discrete_ACPILevel ...@@ -153,8 +149,7 @@ struct SMU7_Discrete_ACPILevel
typedef struct SMU7_Discrete_ACPILevel SMU7_Discrete_ACPILevel; typedef struct SMU7_Discrete_ACPILevel SMU7_Discrete_ACPILevel;
struct SMU7_Discrete_Ulv struct SMU7_Discrete_Ulv {
{
uint32_t CcPwrDynRm; uint32_t CcPwrDynRm;
uint32_t CcPwrDynRm1; uint32_t CcPwrDynRm1;
uint16_t VddcOffset; uint16_t VddcOffset;
...@@ -165,8 +160,7 @@ struct SMU7_Discrete_Ulv ...@@ -165,8 +160,7 @@ struct SMU7_Discrete_Ulv
typedef struct SMU7_Discrete_Ulv SMU7_Discrete_Ulv; typedef struct SMU7_Discrete_Ulv SMU7_Discrete_Ulv;
struct SMU7_Discrete_MemoryLevel struct SMU7_Discrete_MemoryLevel {
{
uint32_t MinVddc; uint32_t MinVddc;
uint32_t MinVddcPhases; uint32_t MinVddcPhases;
uint32_t MinVddci; uint32_t MinVddci;
...@@ -206,8 +200,7 @@ struct SMU7_Discrete_MemoryLevel ...@@ -206,8 +200,7 @@ struct SMU7_Discrete_MemoryLevel
typedef struct SMU7_Discrete_MemoryLevel SMU7_Discrete_MemoryLevel; typedef struct SMU7_Discrete_MemoryLevel SMU7_Discrete_MemoryLevel;
struct SMU7_Discrete_LinkLevel struct SMU7_Discrete_LinkLevel {
{
uint8_t PcieGenSpeed; uint8_t PcieGenSpeed;
uint8_t PcieLaneCount; uint8_t PcieLaneCount;
uint8_t EnabledForActivity; uint8_t EnabledForActivity;
...@@ -220,8 +213,7 @@ struct SMU7_Discrete_LinkLevel ...@@ -220,8 +213,7 @@ struct SMU7_Discrete_LinkLevel
typedef struct SMU7_Discrete_LinkLevel SMU7_Discrete_LinkLevel; typedef struct SMU7_Discrete_LinkLevel SMU7_Discrete_LinkLevel;
struct SMU7_Discrete_MCArbDramTimingTableEntry struct SMU7_Discrete_MCArbDramTimingTableEntry {
{
uint32_t McArbDramTiming; uint32_t McArbDramTiming;
uint32_t McArbDramTiming2; uint32_t McArbDramTiming2;
uint8_t McArbBurstTime; uint8_t McArbBurstTime;
...@@ -230,15 +222,13 @@ struct SMU7_Discrete_MCArbDramTimingTableEntry ...@@ -230,15 +222,13 @@ struct SMU7_Discrete_MCArbDramTimingTableEntry
typedef struct SMU7_Discrete_MCArbDramTimingTableEntry SMU7_Discrete_MCArbDramTimingTableEntry; typedef struct SMU7_Discrete_MCArbDramTimingTableEntry SMU7_Discrete_MCArbDramTimingTableEntry;
struct SMU7_Discrete_MCArbDramTimingTable struct SMU7_Discrete_MCArbDramTimingTable {
{
SMU7_Discrete_MCArbDramTimingTableEntry entries[SMU__NUM_SCLK_DPM_STATE][SMU__NUM_MCLK_DPM_LEVELS]; SMU7_Discrete_MCArbDramTimingTableEntry entries[SMU__NUM_SCLK_DPM_STATE][SMU__NUM_MCLK_DPM_LEVELS];
}; };
typedef struct SMU7_Discrete_MCArbDramTimingTable SMU7_Discrete_MCArbDramTimingTable; typedef struct SMU7_Discrete_MCArbDramTimingTable SMU7_Discrete_MCArbDramTimingTable;
struct SMU7_Discrete_UvdLevel struct SMU7_Discrete_UvdLevel {
{
uint32_t VclkFrequency; uint32_t VclkFrequency;
uint32_t DclkFrequency; uint32_t DclkFrequency;
uint16_t MinVddc; uint16_t MinVddc;
...@@ -250,8 +240,7 @@ struct SMU7_Discrete_UvdLevel ...@@ -250,8 +240,7 @@ struct SMU7_Discrete_UvdLevel
typedef struct SMU7_Discrete_UvdLevel SMU7_Discrete_UvdLevel; typedef struct SMU7_Discrete_UvdLevel SMU7_Discrete_UvdLevel;
struct SMU7_Discrete_ExtClkLevel struct SMU7_Discrete_ExtClkLevel {
{
uint32_t Frequency; uint32_t Frequency;
uint16_t MinVoltage; uint16_t MinVoltage;
uint8_t MinPhases; uint8_t MinPhases;
...@@ -260,8 +249,7 @@ struct SMU7_Discrete_ExtClkLevel ...@@ -260,8 +249,7 @@ struct SMU7_Discrete_ExtClkLevel
typedef struct SMU7_Discrete_ExtClkLevel SMU7_Discrete_ExtClkLevel; typedef struct SMU7_Discrete_ExtClkLevel SMU7_Discrete_ExtClkLevel;
struct SMU7_Discrete_StateInfo struct SMU7_Discrete_StateInfo {
{
uint32_t SclkFrequency; uint32_t SclkFrequency;
uint32_t MclkFrequency; uint32_t MclkFrequency;
uint32_t VclkFrequency; uint32_t VclkFrequency;
...@@ -285,8 +273,7 @@ struct SMU7_Discrete_StateInfo ...@@ -285,8 +273,7 @@ struct SMU7_Discrete_StateInfo
typedef struct SMU7_Discrete_StateInfo SMU7_Discrete_StateInfo; typedef struct SMU7_Discrete_StateInfo SMU7_Discrete_StateInfo;
struct SMU7_Discrete_DpmTable struct SMU7_Discrete_DpmTable {
{
SMU7_PIDController GraphicsPIDController; SMU7_PIDController GraphicsPIDController;
SMU7_PIDController MemoryPIDController; SMU7_PIDController MemoryPIDController;
SMU7_PIDController LinkPIDController; SMU7_PIDController LinkPIDController;
...@@ -406,23 +393,20 @@ typedef struct SMU7_Discrete_DpmTable SMU7_Discrete_DpmTable; ...@@ -406,23 +393,20 @@ typedef struct SMU7_Discrete_DpmTable SMU7_Discrete_DpmTable;
#define SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE 16 #define SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE 16
#define SMU7_DISCRETE_MC_REGISTER_ARRAY_SET_COUNT SMU7_MAX_LEVELS_MEMORY #define SMU7_DISCRETE_MC_REGISTER_ARRAY_SET_COUNT SMU7_MAX_LEVELS_MEMORY
struct SMU7_Discrete_MCRegisterAddress struct SMU7_Discrete_MCRegisterAddress {
{
uint16_t s0; uint16_t s0;
uint16_t s1; uint16_t s1;
}; };
typedef struct SMU7_Discrete_MCRegisterAddress SMU7_Discrete_MCRegisterAddress; typedef struct SMU7_Discrete_MCRegisterAddress SMU7_Discrete_MCRegisterAddress;
struct SMU7_Discrete_MCRegisterSet struct SMU7_Discrete_MCRegisterSet {
{
uint32_t value[SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE]; uint32_t value[SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE];
}; };
typedef struct SMU7_Discrete_MCRegisterSet SMU7_Discrete_MCRegisterSet; typedef struct SMU7_Discrete_MCRegisterSet SMU7_Discrete_MCRegisterSet;
struct SMU7_Discrete_MCRegisters struct SMU7_Discrete_MCRegisters {
{
uint8_t last; uint8_t last;
uint8_t reserved[3]; uint8_t reserved[3];
SMU7_Discrete_MCRegisterAddress address[SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE]; SMU7_Discrete_MCRegisterAddress address[SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE];
...@@ -431,8 +415,7 @@ struct SMU7_Discrete_MCRegisters ...@@ -431,8 +415,7 @@ struct SMU7_Discrete_MCRegisters
typedef struct SMU7_Discrete_MCRegisters SMU7_Discrete_MCRegisters; typedef struct SMU7_Discrete_MCRegisters SMU7_Discrete_MCRegisters;
struct SMU7_Discrete_FanTable struct SMU7_Discrete_FanTable {
{
uint16_t FdoMode; uint16_t FdoMode;
int16_t TempMin; int16_t TempMin;
int16_t TempMed; int16_t TempMed;
......
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