drm: Move the GET_CAP macros next to the corresponding ioctl structure (a99b57db) · Commits · 戴 / test

It's a tiny bit more logical to find the different capabilities you can use with the GET_CAP ioctl next to the structure rather than putting them at the end of the file. v2: Tab align the litterals (David Herrmann) v3: Make it clearer that DRM_PRIME_CAP_EXPORT/IMPORT are flags of DRM_CAP_PRIME. v4: Rebase on top of latest bits (DRM_CAP_ASYNC_PAGE_FLIP was introduced) Reviewed-by: David Herrmann <dh.herrmann@gmail.com> (for v2) Signed-off-by:

Damien Lespiau <damien.lespiau@intel.com> Acked-by:

Dave Airlie <airlied@gmail.com> Signed-off-by:

Daniel Vetter <daniel.vetter@ffwll.ch>

include/uapi/drm/drm.h

+10 −11

Original line number	Diff line number	Diff line
		@@ -611,6 +611,16 @@ struct drm_gem_open {
		__u64 size;
		};

		#define DRM_CAP_DUMB_BUFFER 0x1
		#define DRM_CAP_VBLANK_HIGH_CRTC 0x2
		#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3
		#define DRM_CAP_DUMB_PREFER_SHADOW 0x4
		#define DRM_CAP_PRIME 0x5
		#define DRM_PRIME_CAP_IMPORT 0x1
		#define DRM_PRIME_CAP_EXPORT 0x2
		#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6
		#define DRM_CAP_ASYNC_PAGE_FLIP 0x7

		/** DRM_IOCTL_GET_CAP ioctl argument type */
		struct drm_get_cap {
		__u64 capability;
		@@ -774,17 +784,6 @@ struct drm_event_vblank {
		__u32 reserved;
		};

		#define DRM_CAP_DUMB_BUFFER 0x1
		#define DRM_CAP_VBLANK_HIGH_CRTC 0x2
		#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3
		#define DRM_CAP_DUMB_PREFER_SHADOW 0x4
		#define DRM_CAP_PRIME 0x5
		#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6
		#define DRM_CAP_ASYNC_PAGE_FLIP 0x7

		#define DRM_PRIME_CAP_IMPORT 0x1
		#define DRM_PRIME_CAP_EXPORT 0x2

		/* typedef area */
		#ifndef __KERNEL__
		typedef struct drm_clip_rect drm_clip_rect_t;

Admin message