History

Merge tag 'drm-misc-next-2021-01-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v5.12: Core Changes: - Lots of drm documentation updates by Simor Ser. - Require that each crtc has a unique primary plane. - Add fixme that fbdev_generic_setup is confusing. Driver Changes: - Update addresses for TI display drivers maintainers. - Make DRM_VIRTIO_GPU select VIRTIO. - Small fixes to qxl, virtio, hisilicon, tve200, panel/s6e63m0.

Daniel Vetter committed 5 years ago

Commit cb3cfbf2 parents 73dc923 cf9a4be15 files · +174 −99Browse files

Showing the changes to include/uapi (1 of 15 files). Show all

Unified · Split

include/uapi/drm/drm.h+49−48
@@ -1,11 +1,10 @@
1−/**
2− * \file drm.h
1+/*
32 * Header for the Direct Rendering Manager
43 *
5− * \author Rickard E. (Rik) Faith <faith@valinux.com>
4+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
65 *
7− * \par Acknowledgments:
8− * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic \c cmpxchg.
6+ * Acknowledgments:
7+ * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
98 */
109
1110 /*
@@ -85,7 +84,7 @@ typedef unsigned int drm_context_t; · 73 unmodified lines
8584 typedef unsigned int drm_drawable_t;
8685 typedef unsigned int drm_magic_t;
8786
88−/**
87+/*
8988 * Cliprect.
9089 *
9190 * \warning: If you change this structure, make sure you change
@@ -101,7 +100,7 @@ struct drm_clip_rect { · 9 unmodified lines
101100 unsigned short y2;
102101 };
103102
104−/**
103+/*
105104 * Drawable information.
106105 */
107106 struct drm_drawable_info {
@@ -109,7 +108,7 @@ struct drm_drawable_info { · 1 unmodified line
109108 struct drm_clip_rect *rects;
110109 };
111110
112−/**
111+/*
113112 * Texture region,
114113 */
115114 struct drm_tex_region {
@@ -120,7 +119,7 @@ struct drm_tex_region { · 4 unmodified lines
120119 unsigned int age;
121120 };
122121
123−/**
122+/*
124123 * Hardware lock.
125124 *
126125 * The lock structure is a simple cache-line aligned integer. To avoid
@@ -132,7 +131,7 @@ struct drm_hw_lock { · 5 unmodified lines
132131 char padding[60]; /**< Pad to cache line */
133132 };
134133
135−/**
134+/*
136135 * DRM_IOCTL_VERSION ioctl argument type.
137136 *
138137 * \sa drmGetVersion().
@@ -149,7 +148,7 @@ struct drm_version { · 10 unmodified lines
149148 char __user *desc; /**< User-space buffer to hold desc */
150149 };
151150
152−/**
151+/*
153152 * DRM_IOCTL_GET_UNIQUE ioctl argument type.
154153 *
155154 * \sa drmGetBusid() and drmSetBusId().
@@ -168,7 +167,7 @@ struct drm_block { · 12 unmodified lines
168167 int unused;
169168 };
170169
171−/**
170+/*
172171 * DRM_IOCTL_CONTROL ioctl argument type.
173172 *
174173 * \sa drmCtlInstHandler() and drmCtlUninstHandler().
@@ -183,7 +182,7 @@ struct drm_control { · 8 unmodified lines
183182 int irq;
184183 };
185184
186−/**
185+/*
187186 * Type of memory to map.
188187 */
189188 enum drm_map_type {
@@ -195,7 +194,7 @@ enum drm_map_type { · 5 unmodified lines
195194 _DRM_CONSISTENT = 5 /**< Consistent memory for PCI DMA */
196195 };
197196
198−/**
197+/*
199198 * Memory mapping flags.
200199 */
201200 enum drm_map_flags {
@@ -214,7 +213,7 @@ struct drm_ctx_priv_map { · 12 unmodified lines
214213 void *handle; /**< Handle of map */
215214 };
216215
217−/**
216+/*
218217 * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls
219218 * argument type.
220219 *
@@ -231,7 +230,7 @@ struct drm_map { · 10 unmodified lines
231230 /* Private data */
232231 };
233232
234−/**
233+/*
235234 * DRM_IOCTL_GET_CLIENT ioctl argument type.
236235 */
237236 struct drm_client {
@@ -263,7 +262,7 @@ enum drm_stat_type { · 25 unmodified lines
263262 /* Add to the *END* of the list */
264263 };
265264
266−/**
265+/*
267266 * DRM_IOCTL_GET_STATS ioctl argument type.
268267 */
269268 struct drm_stats {
@@ -274,7 +273,7 @@ struct drm_stats { · 4 unmodified lines
274273 } data[15];
275274 };
276275
277−/**
276+/*
278277 * Hardware locking flags.
279278 */
280279 enum drm_lock_flags {
@@ -289,7 +288,7 @@ enum drm_lock_flags { · 8 unmodified lines
289288 _DRM_HALT_CUR_QUEUES = 0x20 /**< Halt all current queues */
290289 };
291290
292−/**
291+/*
293292 * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type.
294293 *
295294 * \sa drmGetLock() and drmUnlock().
@@ -299,7 +298,7 @@ struct drm_lock { · 3 unmodified lines
299298 enum drm_lock_flags flags;
300299 };
301300
302−/**
301+/*
303302 * DMA flags
304303 *
305304 * \warning
@@ -328,7 +327,7 @@ enum drm_dma_flags { · 22 unmodified lines
328327 _DRM_DMA_LARGER_OK = 0x40 /**< Larger-than-requested buffers OK */
329328 };
330329
331−/**
330+/*
332331 * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type.
333332 *
334333 * \sa drmAddBufs().
@@ -351,7 +350,7 @@ struct drm_buf_desc { · 16 unmodified lines
351350 */
352351 };
353352
354−/**
353+/*
355354 * DRM_IOCTL_INFO_BUFS ioctl argument type.
356355 */
357356 struct drm_buf_info {
@@ -359,7 +358,7 @@ struct drm_buf_info { · 1 unmodified line
359358 struct drm_buf_desc __user *list;
360359 };
361360
362−/**
361+/*
363362 * DRM_IOCTL_FREE_BUFS ioctl argument type.
364363 */
365364 struct drm_buf_free {
@@ -367,7 +366,7 @@ struct drm_buf_free { · 1 unmodified line
367366 int __user *list;
368367 };
369368
370−/**
369+/*
371370 * Buffer information
372371 *
373372 * \sa drm_buf_map.
@@ -379,7 +378,7 @@ struct drm_buf_pub { · 5 unmodified lines
379378 void __user *address; /**< Address of buffer */
380379 };
381380
382−/**
381+/*
383382 * DRM_IOCTL_MAP_BUFS ioctl argument type.
384383 */
385384 struct drm_buf_map {
@@ -392,7 +391,7 @@ struct drm_buf_map { · 6 unmodified lines
392391 struct drm_buf_pub __user *list; /**< Buffer information */
393392 };
394393
395−/**
394+/*
396395 * DRM_IOCTL_DMA ioctl argument type.
397396 *
398397 * Indices here refer to the offset into the buffer list in drm_buf_get.
@@ -417,7 +416,7 @@ enum drm_ctx_flags { · 18 unmodified lines
417416 _DRM_CONTEXT_2DONLY = 0x02
418417 };
419418
420−/**
419+/*
421420 * DRM_IOCTL_ADD_CTX ioctl argument type.
422421 *
423422 * \sa drmCreateContext() and drmDestroyContext().
@@ -427,7 +426,7 @@ struct drm_ctx { · 3 unmodified lines
427426 enum drm_ctx_flags flags;
428427 };
429428
430−/**
429+/*
431430 * DRM_IOCTL_RES_CTX ioctl argument type.
432431 */
433432 struct drm_ctx_res {
@@ -435,14 +434,14 @@ struct drm_ctx_res { · 1 unmodified line
435434 struct drm_ctx __user *contexts;
436435 };
437436
438−/**
437+/*
439438 * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type.
440439 */
441440 struct drm_draw {
442441 drm_drawable_t handle;
443442 };
444443
445−/**
444+/*
446445 * DRM_IOCTL_UPDATE_DRAW ioctl argument type.
447446 */
448447 typedef enum {
@@ -456,14 +455,14 @@ struct drm_update_draw { · 7 unmodified lines
456455 unsigned long long data;
457456 };
458457
459−/**
458+/*
460459 * DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type.
461460 */
462461 struct drm_auth {
463462 drm_magic_t magic;
464463 };
465464
466−/**
465+/*
467466 * DRM_IOCTL_IRQ_BUSID ioctl argument type.
468467 *
469468 * \sa drmGetInterruptFromBusID().
@@ -505,7 +504,7 @@ struct drm_wait_vblank_reply { · 35 unmodified lines
505504 long tval_usec;
506505 };
507506
508−/**
507+/*
509508 * DRM_IOCTL_WAIT_VBLANK ioctl argument type.
510509 *
511510 * \sa drmWaitVBlank().
@@ -518,7 +517,7 @@ union drm_wait_vblank { · 6 unmodified lines
518517 #define _DRM_PRE_MODESET 1
519518 #define _DRM_POST_MODESET 2
520519
521−/**
520+/*
522521 * DRM_IOCTL_MODESET_CTL ioctl argument type
523522 *
524523 * \sa drmModesetCtl().
@@ -528,7 +527,7 @@ struct drm_modeset_ctl { · 3 unmodified lines
528527 __u32 cmd;
529528 };
530529
531−/**
530+/*
532531 * DRM_IOCTL_AGP_ENABLE ioctl argument type.
533532 *
534533 * \sa drmAgpEnable().
@@ -537,7 +536,7 @@ struct drm_agp_mode { · 2 unmodified lines
537536 unsigned long mode; /**< AGP mode */
538537 };
539538
540−/**
539+/*
541540 * DRM_IOCTL_AGP_ALLOC and DRM_IOCTL_AGP_FREE ioctls argument type.
542541 *
543542 * \sa drmAgpAlloc() and drmAgpFree().
@@ -549,7 +548,7 @@ struct drm_agp_buffer { · 5 unmodified lines
549548 unsigned long physical; /**< Physical used by i810 */
550549 };
551550
552−/**
551+/*
553552 * DRM_IOCTL_AGP_BIND and DRM_IOCTL_AGP_UNBIND ioctls argument type.
554553 *
555554 * \sa drmAgpBind() and drmAgpUnbind().
@@ -559,7 +558,7 @@ struct drm_agp_binding { · 3 unmodified lines
559558 unsigned long offset; /**< In bytes -- will round to page boundary */
560559 };
561560
562−/**
561+/*
563562 * DRM_IOCTL_AGP_INFO ioctl argument type.
564563 *
565564 * \sa drmAgpVersionMajor(), drmAgpVersionMinor(), drmAgpGetMode(),
@@ -580,7 +579,7 @@ struct drm_agp_info { · 14 unmodified lines
580579 unsigned short id_device;
581580 };
582581
583−/**
582+/*
584583 * DRM_IOCTL_SG_ALLOC ioctl argument type.
585584 */
586585 struct drm_scatter_gather {
@@ -588,7 +587,7 @@ struct drm_scatter_gather { · 1 unmodified line
588587 unsigned long handle; /**< Used for mapping / unmapping */
589588 };
590589
591−/**
590+/*
592591 * DRM_IOCTL_SET_VERSION ioctl argument type.
593592 */
594593 struct drm_set_version {
@@ -598,14 +597,14 @@ struct drm_set_version { · 3 unmodified lines
598597 int drm_dd_minor;
599598 };
600599
601−/** DRM_IOCTL_GEM_CLOSE ioctl argument type */
600+/* DRM_IOCTL_GEM_CLOSE ioctl argument type */
602601 struct drm_gem_close {
603602 /** Handle of the object to be closed. */
604603 __u32 handle;
605604 __u32 pad;
606605 };
607606
608−/** DRM_IOCTL_GEM_FLINK ioctl argument type */
607+/* DRM_IOCTL_GEM_FLINK ioctl argument type */
609608 struct drm_gem_flink {
610609 /** Handle for the object being named */
611610 __u32 handle;
@@ -614,7 +613,7 @@ struct drm_gem_flink { · 2 unmodified lines
614613 __u32 name;
615614 };
616615
617−/** DRM_IOCTL_GEM_OPEN ioctl argument type */
616+/* DRM_IOCTL_GEM_OPEN ioctl argument type */
618617 struct drm_gem_open {
619618 /** Name of object being opened */
620619 __u32 name;
@@ -652,7 +651,7 @@ struct drm_gem_open { · 31 unmodified lines
652651 #define DRM_CAP_SYNCOBJ 0x13
653652 #define DRM_CAP_SYNCOBJ_TIMELINE 0x14
654653
655−/** DRM_IOCTL_GET_CAP ioctl argument type */
654+/* DRM_IOCTL_GET_CAP ioctl argument type */
656655 struct drm_get_cap {
657656 __u64 capability;
658657 __u64 value;
@@ -678,7 +677,9 @@ struct drm_get_cap { · 19 unmodified lines
678677 /**
679678 * DRM_CLIENT_CAP_ATOMIC
680679 *
681− * If set to 1, the DRM core will expose atomic properties to userspace
680+ * If set to 1, the DRM core will expose atomic properties to userspace. This
681+ * implicitly enables &DRM_CLIENT_CAP_UNIVERSAL_PLANES and
682+ * &DRM_CLIENT_CAP_ASPECT_RATIO.
682683 */
683684 #define DRM_CLIENT_CAP_ATOMIC 3
684685
@@ -698,7 +699,7 @@ struct drm_get_cap { · 13 unmodified lines
698699 */
699700 #define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5
700701
701−/** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
702+/* DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
702703 struct drm_set_client_cap {
703704 __u64 capability;
704705 __u64 value;
@@ -950,7 +951,7 @@ extern "C" { · 245 unmodified lines
950951
951952 #define DRM_IOCTL_MODE_GETFB2 DRM_IOWR(0xCE, struct drm_mode_fb_cmd2)
952953
953−/**
954+/*
954955 * Device specific ioctls should only be in their respective headers
955956 * The device specific ioctl range is from 0x40 to 0x9f.
956957 * Generic IOCTLS restart at 0xA0.
@@ -961,7 +962,7 @@ extern "C" { · 4 unmodified lines
961962 #define DRM_COMMAND_BASE 0x40
962963 #define DRM_COMMAND_END 0xA0
963964
964−/**
965+/*
965966 * Header for events written back to userspace on the drm fd. The
966967 * type defines the type of event, the length specifies the total
967968 * length of the event (including the header), and user_data is