aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_guc_fwif.h
diff options
context:
space:
mode:
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>2017-10-06 04:49:40 -0400
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>2017-10-06 07:09:40 -0400
commitfaf654864b25f4ca4efd416145d37b794c0b805f (patch)
treee01b34b654fb3ae21193a05ab834fecb8a6b2828 /drivers/gpu/drm/i915/intel_guc_fwif.h
parent822a4b673284672af697ccd66e8795f8a712a90d (diff)
drm/i915: Unify uC variable types to avoid flooding checkpatch.pl
With the code motion mostly done, convert all the uC code away from uint??_t at once (only a couple dozen variables), so that reading the checkpatch.pl output should actually pinpoint if a new uint??_t was accidentally introduced. v2: - Include intel_uc_fw.h too (Sagar) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: MichaƂ Winiarski <michal.winiarski@intel.com> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> Cc: Sujaritha Sundaresan <sujaritha.sundaresan@intel.com> Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171006084940.15910-1-joonas.lahtinen@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_fwif.h')
-rw-r--r--drivers/gpu/drm/i915/intel_guc_fwif.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
index 7eb6b4fa1d6f..1c0a2a3de121 100644
--- a/drivers/gpu/drm/i915/intel_guc_fwif.h
+++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
@@ -178,49 +178,49 @@
178 */ 178 */
179 179
180struct uc_css_header { 180struct uc_css_header {
181 uint32_t module_type; 181 u32 module_type;
182 /* header_size includes all non-uCode bits, including css_header, rsa 182 /* header_size includes all non-uCode bits, including css_header, rsa
183 * key, modulus key and exponent data. */ 183 * key, modulus key and exponent data. */
184 uint32_t header_size_dw; 184 u32 header_size_dw;
185 uint32_t header_version; 185 u32 header_version;
186 uint32_t module_id; 186 u32 module_id;
187 uint32_t module_vendor; 187 u32 module_vendor;
188 union { 188 union {
189 struct { 189 struct {
190 uint8_t day; 190 u8 day;
191 uint8_t month; 191 u8 month;
192 uint16_t year; 192 u16 year;
193 }; 193 };
194 uint32_t date; 194 u32 date;
195 }; 195 };
196 uint32_t size_dw; /* uCode plus header_size_dw */ 196 u32 size_dw; /* uCode plus header_size_dw */
197 uint32_t key_size_dw; 197 u32 key_size_dw;
198 uint32_t modulus_size_dw; 198 u32 modulus_size_dw;
199 uint32_t exponent_size_dw; 199 u32 exponent_size_dw;
200 union { 200 union {
201 struct { 201 struct {
202 uint8_t hour; 202 u8 hour;
203 uint8_t min; 203 u8 min;
204 uint16_t sec; 204 u16 sec;
205 }; 205 };
206 uint32_t time; 206 u32 time;
207 }; 207 };
208 208
209 char username[8]; 209 char username[8];
210 char buildnumber[12]; 210 char buildnumber[12];
211 union { 211 union {
212 struct { 212 struct {
213 uint32_t branch_client_version; 213 u32 branch_client_version;
214 uint32_t sw_version; 214 u32 sw_version;
215 } guc; 215 } guc;
216 struct { 216 struct {
217 uint32_t sw_version; 217 u32 sw_version;
218 uint32_t reserved; 218 u32 reserved;
219 } huc; 219 } huc;
220 }; 220 };
221 uint32_t prod_preprod_fw; 221 u32 prod_preprod_fw;
222 uint32_t reserved[12]; 222 u32 reserved[12];
223 uint32_t header_info; 223 u32 header_info;
224} __packed; 224} __packed;
225 225
226struct guc_doorbell_info { 226struct guc_doorbell_info {