summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2017-11-08 11:18:47 -0800
committerEric Anholt <eric@anholt.net>2017-11-10 12:10:15 -0800
commit59808bcacd48f4168c3c1093b4616c2ee039b5a1 (patch)
tree6f6b7badc5e07a9b9274ce359ab37826557e5a64
parent8affa2699587b8239135b75ade24ee837df1606c (diff)
headers: Sync up mga_drm.h from drm-next.
The kernel started using the struct from drm.h instead of the typedef. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--include/drm/README4
-rw-r--r--include/drm/mga_drm.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/include/drm/README b/include/drm/README
index 47d80929..6e12ca4d 100644
--- a/include/drm/README
+++ b/include/drm/README
@@ -100,10 +100,6 @@ i915_drm.h
- Missing PARAMS - HAS_POOLED_EU, MIN_EU_IN_POOL CONTEXT_PARAM_NO_ERROR_CAPTURE
Status: Trivial.
-mga_drm.h
- - Typo fix, use struct over typedef.
-Status: Trivial.
-
nouveau_drm.h
- Missing macros NOUVEAU_GETPARAM*, NOUVEAU_DRM_HEADER_PATCHLEVEL, structs,
enums, using stdint.h over the __u* types.
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index 7035a664..79300111 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -252,7 +252,7 @@ typedef struct _drm_mga_sarea {
#define DRM_MGA_DMA_BOOTSTRAP 0x0c
#define DRM_IOCTL_MGA_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t)
-#define DRM_IOCTL_MGA_FLUSH DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, drm_lock_t)
+#define DRM_IOCTL_MGA_FLUSH DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, struct drm_lock)
#define DRM_IOCTL_MGA_RESET DRM_IO( DRM_COMMAND_BASE + DRM_MGA_RESET)
#define DRM_IOCTL_MGA_SWAP DRM_IO( DRM_COMMAND_BASE + DRM_MGA_SWAP)
#define DRM_IOCTL_MGA_CLEAR DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_CLEAR, drm_mga_clear_t)