[PATCH libdrm 4/6] headers: Sync up mga_drm.h from drm-next.

Eric Anholt eric at anholt.net
Wed Nov 8 19:34:45 UTC 2017


The kernel started using the struct from drm.h instead of the typedef.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 include/drm/README    | 4 ----
 include/drm/mga_drm.h | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/drm/README b/include/drm/README
index 47d80929a8f1..6e12ca4d81f6 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 7035a664d503..793001114821 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)
-- 
2.15.0



More information about the dri-devel mailing list