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

Commit 7c10ddf8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next 

Not the biggest fan of doing it this way, but what the hell.

* 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux: (22 commits)
  drm/vmwgfx: add extern C guard for the UAPI header
  drm/virgl: add extern C guard for the UAPI header
  drm/via: add extern C guard for the UAPI header
  drm/vc4: add extern C guard for the UAPI header
  drm/tegra: add extern C guard for the UAPI header
  drm/sis: add extern C guard for the UAPI header
  drm/savage: add extern C guard for the UAPI header
  drm/radeon: add extern C guard for the UAPI header
  drm/r128: add extern C guard for the UAPI header
  drm/qxl: add extern C guard for the UAPI header
  drm/omap: add extern C guard for the UAPI header
  drm/nouveau: drop drm/ prefix from include
  drm/nouveau: add extern C guard for the UAPI header
  drm/msm: add extern C guard for the UAPI header
  drm/mga: add extern C guard for the UAPI header
  drm/i915: add extern C guard for the UAPI header
  drm/i810: add extern C guard for the UAPI header
  drm/exynos: add extern C guard for the UAPI header
  drm/etnaviv: add extern C guard for the UAPI header
  drm: add extern C guard for the UAPI headers
  ...
parents 99ee8729 d3450e00

include/uapi/drm/amdgpu_drm.h

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 


#include "drm.h"



#if defined(__cplusplus)

extern "C" {

#endif



#define DRM_AMDGPU_GEM_CREATE		0x00

#define DRM_AMDGPU_GEM_MMAP		0x01

#define DRM_AMDGPU_CTX			0x02
@@ -642,4 +646,8 @@ struct drm_amdgpu_info_hw_ip { 
#define AMDGPU_FAMILY_VI			130 /* Iceland, Tonga */

#define AMDGPU_FAMILY_CZ			135 /* Carrizo, Stoney */



#if defined(__cplusplus)

}

#endif



#endif

include/uapi/drm/armada_drm.h

+8 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 


#include "drm.h"



#if defined(__cplusplus)

extern "C" {

#endif



#define DRM_ARMADA_GEM_CREATE		0x00

#define DRM_ARMADA_GEM_MMAP		0x02

#define DRM_ARMADA_GEM_PWRITE		0x03
@@ -44,4 +48,8 @@ struct drm_armada_gem_pwrite { 
#define DRM_IOCTL_ARMADA_GEM_PWRITE \

	ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)



#if defined(__cplusplus)

}

#endif



#endif

include/uapi/drm/drm.h

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ typedef unsigned long drm_handle_t; 


#endif



#if defined(__cplusplus)

extern "C" {

#endif



#define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */

#define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */

#define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */
@@ -691,8 +695,16 @@ struct drm_prime_handle { 
	__s32 fd;

};



#if defined(__cplusplus)

}

#endif



#include "drm_mode.h"



#if defined(__cplusplus)

extern "C" {

#endif



#define DRM_IOCTL_BASE			'd'

#define DRM_IO(nr)			_IO(DRM_IOCTL_BASE,nr)

#define DRM_IOR(nr,type)		_IOR(DRM_IOCTL_BASE,nr,type)
@@ -886,4 +898,8 @@ typedef struct drm_scatter_gather drm_scatter_gather_t; 
typedef struct drm_set_version drm_set_version_t;

#endif



#if defined(__cplusplus)

}

#endif



#endif

include/uapi/drm/drm_fourcc.h

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 


#include "drm.h"



#if defined(__cplusplus)

extern "C" {

#endif



#define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \

				 ((__u32)(c) << 16) | ((__u32)(d) << 24))
@@ -229,4 +233,8 @@ 
 */

#define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE	fourcc_mod_code(SAMSUNG, 1)



#if defined(__cplusplus)

}

#endif



#endif /* DRM_FOURCC_H */

include/uapi/drm/drm_mode.h

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ 


#include "drm.h"



#if defined(__cplusplus)

extern "C" {

#endif



#define DRM_DISPLAY_INFO_LEN	32

#define DRM_CONNECTOR_NAME_LEN	32

#define DRM_DISPLAY_MODE_LEN	32
@@ -623,4 +627,8 @@ struct drm_mode_destroy_blob { 
	__u32 blob_id;

};



#if defined(__cplusplus)

}

#endif



#endif