* tag 'topic/drm-misc-2016-04-01' of git://anongit.freedesktop.org/drm-intel: drm: Add new DCS commands in the enum list drm: Make uapi headers C89 pendantic compliant drm/atomic: export drm_atomic_helper_wait_for_fences() drm: Untangle __KERNEL__ guards drm: Move DRM_MODE_OBJECT_* to uapi headers drm: align #include directives with libdrm in uapi headers drm: Make drm.h uapi header safe for C++ vgacon: dummy implementation for vgacon_text_force drm/sysfs: Nuke TV/DVI property files drm/ttm: Remove TTM_HAS_AGP drm: bridge/dw-hdmi: Remove pre_enable/post_disable dummy funcs Revert "drm: Don't pass negative delta to ktime_sub_ns()" drm/atmel: Fixup drm_connector_/unplug/unregister/_all drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all() drm: bridge: Make (pre/post) enable/disable callbacks optional
Showing the changes to include/uapi (2 of 29 files). Show all
Unified · Split
| @@ -36,7 +36,13 @@ · 35 unmodified lines | ||
| 36 | 36 | #ifndef _DRM_H_ |
| 37 | 37 | #define _DRM_H_ |
| 38 | 38 | |
| 39 | −#if defined(__KERNEL__) || defined(__linux__) | |
| 39 | +#if defined(__KERNEL__) | |
| 40 | + | |
| 41 | +#include <linux/types.h> | |
| 42 | +#include <asm/ioctl.h> | |
| 43 | +typedef unsigned int drm_handle_t; | |
| 44 | + | |
| 45 | +#elif defined(__linux__) | |
| 40 | 46 | |
| 41 | 47 | #include <linux/types.h> |
| 42 | 48 | #include <asm/ioctl.h> |
| @@ -181,7 +187,7 @@ enum drm_map_type { · 138 unmodified lines | ||
| 181 | 187 | _DRM_SHM = 2, /**< shared, cached */ |
| 182 | 188 | _DRM_AGP = 3, /**< AGP/GART */ |
| 183 | 189 | _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ |
| 184 | − _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ | |
| 190 | + _DRM_CONSISTENT = 5 /**< Consistent memory for PCI DMA */ | |
| 185 | 191 | }; |
| 186 | 192 | |
| 187 | 193 | /** |
| @@ -373,7 +379,11 @@ struct drm_buf_pub { · 185 unmodified lines | ||
| 373 | 379 | */ |
| 374 | 380 | struct drm_buf_map { |
| 375 | 381 | int count; /**< Length of the buffer list */ |
| 382 | +#ifdef __cplusplus | |
| 383 | + void __user *virt; | |
| 384 | +#else | |
| 376 | 385 | void __user *virtual; /**< Mmap'd area in user-virtual */ |
| 386 | +#endif | |
| 377 | 387 | struct drm_buf_pub __user *list; /**< Buffer information */ |
| 378 | 388 | }; |
| 379 | 389 | |
| @@ -431,7 +441,7 @@ struct drm_draw { · 51 unmodified lines | ||
| 431 | 441 | * DRM_IOCTL_UPDATE_DRAW ioctl argument type. |
| 432 | 442 | */ |
| 433 | 443 | typedef enum { |
| 434 | − DRM_DRAWABLE_CLIPRECTS, | |
| 444 | + DRM_DRAWABLE_CLIPRECTS | |
| 435 | 445 | } drm_drawable_info_type_t; |
| 436 | 446 | |
| 437 | 447 | struct drm_update_draw { |
| @@ -681,7 +691,7 @@ struct drm_prime_handle { · 243 unmodified lines | ||
| 681 | 691 | __s32 fd; |
| 682 | 692 | }; |
| 683 | 693 | |
| 684 | −#include <drm/drm_mode.h> | |
| 694 | +#include "drm_mode.h" | |
| 685 | 695 | |
| 686 | 696 | #define DRM_IOCTL_BASE 'd' |
| 687 | 697 | #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) |
| @@ -320,6 +320,16 @@ struct drm_mode_connector_set_property { · 319 unmodified lines | ||
| 320 | 320 | __u32 connector_id; |
| 321 | 321 | }; |
| 322 | 322 | |
| 323 | +#define DRM_MODE_OBJECT_CRTC 0xcccccccc | |
| 324 | +#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0 | |
| 325 | +#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0 | |
| 326 | +#define DRM_MODE_OBJECT_MODE 0xdededede | |
| 327 | +#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0 | |
| 328 | +#define DRM_MODE_OBJECT_FB 0xfbfbfbfb | |
| 329 | +#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb | |
| 330 | +#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee | |
| 331 | +#define DRM_MODE_OBJECT_ANY 0 | |
| 332 | + | |
| 323 | 333 | struct drm_mode_obj_get_properties { |
| 324 | 334 | __u64 props_ptr; |
| 325 | 335 | __u64 prop_values_ptr; |