History

drm/amd/pm: suppress compile warnings about possible unaligned accesses

Suppress the following compile warnings: >> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/inc/smu_v11_0_pptable.h:163:17: warning: field smc_pptable within 'struct smu_11_0_powerplay_table' is less aligned than 'PPTable_t' and is usually due to 'struct smu_11_0_powerplay_table' being packed, which can lead to unaligned accesses [-Wunaligned-access] PPTable_t smc_pptable; //PPTable_t in smu11_driver_if.h ^ 1 warning generated. -- >> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/inc/smu_v11_0_7_pptable.h:193:17: warning: field smc_pptable within 'struct smu_11_0_7_powerplay_table' is less aligned than 'PPTable_t' and is usually due to 'struct smu_11_0_7_powerplay_table' being packed, which can lead to unaligned accesses [-Wunaligned-access] PPTable_t smc_pptable; //PPTable_t in smu11_driver_if.h ^ 1 warning generated. -- >> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/inc/smu_v13_0_pptable.h:161:12: warning: field smc_pptable within 'struct smu_13_0_powerplay_table' is less aligned than 'PPTable_t' and is usually due to 'struct smu_13_0_powerplay_table' being packed, which can lead to unaligned accesses [-Wunaligned-access]

Evan Quan committed 4 years ago

Commit 4513edf1 parent 88467db4 files · +23 −10Browse files

Unified · Split

4 files
  1. drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h +6 −3
  2. drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h +6 −3
  3. drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h +4 −1
  4. drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h +7 −3
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h+6−3
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#ifndef SMU_11_0_7_PPTABLE_H22#ifndef SMU_11_0_7_PPTABLE_H
23#define SMU_11_0_7_PPTABLE_H23#define SMU_11_0_7_PPTABLE_H
24 24
25#pragma pack(push, 1)
25 26
26#define SMU_11_0_7_TABLE_FORMAT_REVISION 1527#define SMU_11_0_7_TABLE_FORMAT_REVISION 15
27 28
@@ -139,7 +140,7 @@ struct smu_11_0_7_overdrive_table · 111 unmodified lines
139 uint32_t max[SMU_11_0_7_MAX_ODSETTING]; //default maximum settings140 uint32_t max[SMU_11_0_7_MAX_ODSETTING]; //default maximum settings
140 uint32_t min[SMU_11_0_7_MAX_ODSETTING]; //default minimum settings141 uint32_t min[SMU_11_0_7_MAX_ODSETTING]; //default minimum settings
141 int16_t pm_setting[SMU_11_0_7_MAX_PMSETTING]; //Optimized power mode feature settings142 int16_t pm_setting[SMU_11_0_7_MAX_PMSETTING]; //Optimized power mode feature settings
142} __attribute__((packed));143};
143 144
144enum SMU_11_0_7_PPCLOCK_ID {145enum SMU_11_0_7_PPCLOCK_ID {
145 SMU_11_0_7_PPCLOCK_GFXCLK = 0,146 SMU_11_0_7_PPCLOCK_GFXCLK = 0,
@@ -166,7 +167,7 @@ struct smu_11_0_7_power_saving_clock_table · 20 unmodified lines
166 uint32_t count; //power_saving_clock_count = SMU_11_0_7_PPCLOCK_COUNT167 uint32_t count; //power_saving_clock_count = SMU_11_0_7_PPCLOCK_COUNT
167 uint32_t max[SMU_11_0_7_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Maximum array In MHz168 uint32_t max[SMU_11_0_7_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Maximum array In MHz
168 uint32_t min[SMU_11_0_7_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Minimum array In MHz169 uint32_t min[SMU_11_0_7_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Minimum array In MHz
169} __attribute__((packed));170};
170 171
171struct smu_11_0_7_powerplay_table172struct smu_11_0_7_powerplay_table
172{173{
@@ -191,6 +192,8 @@ struct smu_11_0_7_powerplay_table · 18 unmodified lines
191 struct smu_11_0_7_overdrive_table overdrive_table;192 struct smu_11_0_7_overdrive_table overdrive_table;
192 193
193 PPTable_t smc_pptable; //PPTable_t in smu11_driver_if.h194 PPTable_t smc_pptable; //PPTable_t in smu11_driver_if.h
194} __attribute__((packed));195};
196
197#pragma pack(pop)
195 198
196#endif199#endif
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h+6−3
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#ifndef SMU_11_0_PPTABLE_H22#ifndef SMU_11_0_PPTABLE_H
23#define SMU_11_0_PPTABLE_H23#define SMU_11_0_PPTABLE_H
24 24
25#pragma pack(push, 1)
25 26
26#define SMU_11_0_TABLE_FORMAT_REVISION 1227#define SMU_11_0_TABLE_FORMAT_REVISION 12
27 28
@@ -109,7 +110,7 @@ struct smu_11_0_overdrive_table · 81 unmodified lines
109 uint8_t cap[SMU_11_0_MAX_ODFEATURE]; //OD feature support flags110 uint8_t cap[SMU_11_0_MAX_ODFEATURE]; //OD feature support flags
110 uint32_t max[SMU_11_0_MAX_ODSETTING]; //default maximum settings111 uint32_t max[SMU_11_0_MAX_ODSETTING]; //default maximum settings
111 uint32_t min[SMU_11_0_MAX_ODSETTING]; //default minimum settings112 uint32_t min[SMU_11_0_MAX_ODSETTING]; //default minimum settings
112} __attribute__((packed));113};
113 114
114enum SMU_11_0_PPCLOCK_ID {115enum SMU_11_0_PPCLOCK_ID {
115 SMU_11_0_PPCLOCK_GFXCLK = 0,116 SMU_11_0_PPCLOCK_GFXCLK = 0,
@@ -133,7 +134,7 @@ struct smu_11_0_power_saving_clock_table · 17 unmodified lines
133 uint32_t count; //power_saving_clock_count = SMU_11_0_PPCLOCK_COUNT134 uint32_t count; //power_saving_clock_count = SMU_11_0_PPCLOCK_COUNT
134 uint32_t max[SMU_11_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Maximum array In MHz135 uint32_t max[SMU_11_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Maximum array In MHz
135 uint32_t min[SMU_11_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Minimum array In MHz136 uint32_t min[SMU_11_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Minimum array In MHz
136} __attribute__((packed));137};
137 138
138struct smu_11_0_powerplay_table139struct smu_11_0_powerplay_table
139{140{
@@ -162,6 +163,8 @@ struct smu_11_0_powerplay_table · 22 unmodified lines
162#ifndef SMU_11_0_PARTIAL_PPTABLE163#ifndef SMU_11_0_PARTIAL_PPTABLE
163 PPTable_t smc_pptable; //PPTable_t in smu11_driver_if.h164 PPTable_t smc_pptable; //PPTable_t in smu11_driver_if.h
164#endif165#endif
165} __attribute__((packed));166};
167
168#pragma pack(pop)
166 169
167#endif170#endif
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h+4−1
@@ -22,6 +22,8 @@ · 21 unmodified lines
22#ifndef SMU_13_0_7_PPTABLE_H22#ifndef SMU_13_0_7_PPTABLE_H
23#define SMU_13_0_7_PPTABLE_H23#define SMU_13_0_7_PPTABLE_H
24 24
25#pragma pack(push, 1)
26
25#define SMU_13_0_7_TABLE_FORMAT_REVISION 1527#define SMU_13_0_7_TABLE_FORMAT_REVISION 15
26 28
27//// POWERPLAYTABLE::ulPlatformCaps29//// POWERPLAYTABLE::ulPlatformCaps
@@ -194,7 +196,8 @@ struct smu_13_0_7_powerplay_table · 166 unmodified lines
194 struct smu_13_0_7_overdrive_table overdrive_table;196 struct smu_13_0_7_overdrive_table overdrive_table;
195 uint8_t padding1;197 uint8_t padding1;
196 PPTable_t smc_pptable; //PPTable_t in driver_if.h198 PPTable_t smc_pptable; //PPTable_t in driver_if.h
197} __attribute__((packed));199};
198 200
201#pragma pack(pop)
199 202
200#endif203#endif
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h+7−3
@@ -22,6 +22,8 @@ · 21 unmodified lines
22#ifndef SMU_13_0_PPTABLE_H22#ifndef SMU_13_0_PPTABLE_H
23#define SMU_13_0_PPTABLE_H23#define SMU_13_0_PPTABLE_H
24 24
25#pragma pack(push, 1)
26
25#define SMU_13_0_TABLE_FORMAT_REVISION 127#define SMU_13_0_TABLE_FORMAT_REVISION 1
26 28
27//// POWERPLAYTABLE::ulPlatformCaps29//// POWERPLAYTABLE::ulPlatformCaps
@@ -109,7 +111,7 @@ struct smu_13_0_overdrive_table { · 81 unmodified lines
109 uint8_t cap[SMU_13_0_MAX_ODFEATURE]; //OD feature support flags111 uint8_t cap[SMU_13_0_MAX_ODFEATURE]; //OD feature support flags
110 uint32_t max[SMU_13_0_MAX_ODSETTING]; //default maximum settings112 uint32_t max[SMU_13_0_MAX_ODSETTING]; //default maximum settings
111 uint32_t min[SMU_13_0_MAX_ODSETTING]; //default minimum settings113 uint32_t min[SMU_13_0_MAX_ODSETTING]; //default minimum settings
112} __attribute__((packed));114};
113 115
114enum SMU_13_0_PPCLOCK_ID {116enum SMU_13_0_PPCLOCK_ID {
115 SMU_13_0_PPCLOCK_GFXCLK = 0,117 SMU_13_0_PPCLOCK_GFXCLK = 0,
@@ -132,7 +134,7 @@ struct smu_13_0_power_saving_clock_table { · 16 unmodified lines
132 uint32_t count; //power_saving_clock_count = SMU_11_0_PPCLOCK_COUNT134 uint32_t count; //power_saving_clock_count = SMU_11_0_PPCLOCK_COUNT
133 uint32_t max[SMU_13_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Maximum array In MHz135 uint32_t max[SMU_13_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Maximum array In MHz
134 uint32_t min[SMU_13_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Minimum array In MHz136 uint32_t min[SMU_13_0_MAX_PPCLOCK]; //PowerSavingClock Mode Clock Minimum array In MHz
135} __attribute__((packed));137};
136 138
137struct smu_13_0_powerplay_table {139struct smu_13_0_powerplay_table {
138 struct atom_common_table_header header;140 struct atom_common_table_header header;
@@ -160,6 +162,8 @@ struct smu_13_0_powerplay_table { · 21 unmodified lines
160#ifndef SMU_13_0_PARTIAL_PPTABLE162#ifndef SMU_13_0_PARTIAL_PPTABLE
161 PPTable_t smc_pptable; //PPTable_t in driver_if.h163 PPTable_t smc_pptable; //PPTable_t in driver_if.h
162#endif164#endif
163} __attribute__((packed));165};
166
167#pragma pack(pop)
164 168
165#endif169#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t