Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 095e2d04 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2017-08-28' of... 

Merge tag 'drm-misc-next-fixes-2017-08-28' of git://anongit.freedesktop.org/git/drm-misc into drm-next

UAPI Changes:
- Rename u32 to __u32 in struct drm_format_modifier_blob (Lionel)

Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

* tag 'drm-misc-next-fixes-2017-08-28' of git://anongit.freedesktop.org/git/drm-misc:
  drm: rename u32 in __u32 in uapi
parents ffa9443f f44d8538

include/uapi/drm/drm_mode.h

+7 −7
Original line number Diff line number Diff line
@@ -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[] */

};