From f44d85389e17b2e960620c1c6d89bda978a11f2b Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 24 Aug 2017 16:08:14 +0100
Subject: [PATCH] drm: rename u32 in __u32 in uapi
Git-commit: f44d85389e17b2e960620c1c6d89bda978a11f2b
Patch-mainline: v4.14-rc1
References: FATE#322643 bsc#1055900
All other fields use __
Cc: Ben Widawsky <ben@bwidawsk.net>
Fixes: db1689aa61b ("drm: Create a format/modifier blob")
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170824150814.5878-1-lionel.g.landwerlin@intel.com
Acked-by: Takashi Iwai <tiwai@suse.de>
---
include/uapi/drm/drm_mode.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -715,24 +715,24 @@ struct drm_mode_atomic {
struct drm_format_modifier_blob {
#define FORMAT_BLOB_CURRENT 1
/* Version of this blob format */
- u32 version;
+ __u32 version;
/* Flags */
- u32 flags;
+ __u32 flags;
/* Number of fourcc formats supported */
- u32 count_formats;
+ __u32 count_formats;
/* Where in this blob the formats exist (in bytes) */
- u32 formats_offset;
+ __u32 formats_offset;
/* Number of drm_format_modifiers */
- u32 count_modifiers;
+ __u32 count_modifiers;
/* Where in this blob the modifiers exist (in bytes) */
- u32 modifiers_offset;
+ __u32 modifiers_offset;
- /* u32 formats[] */
+ /* __u32 formats[] */
/* struct drm_format_modifier modifiers[] */
};