Merge libdrm 2.4.110

6 files changed, 22 insertions, 37 deletions

diff --git a/lib/libdrm/mk/man/drm-kms.7 b/lib/libdrm/mk/man/drm-kms.7
index da6222da8..c2938b94c 100644
--- a/lib/libdrm/mk/man/drm-kms.7
+++ b/lib/libdrm/mk/man/drm-kms.7
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH DRM-KMS 7 "September 2012" "" "Direct Rendering Manager"
-.SH NAME
-drm-kms \- Kernel Mode-Setting
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "DRM-KMS" 7 "September 2012" "" "Direct Rendering Manager"
+.SH NAME
+drm-kms \- Kernel Mode-Setting
 .SH SYNOPSIS
 .sp
 \fB#include <xf86drm.h>\fP
diff --git a/lib/libdrm/mk/man/drm-memory.7 b/lib/libdrm/mk/man/drm-memory.7
index e497d9962..44a9efef2 100644
--- a/lib/libdrm/mk/man/drm-memory.7
+++ b/lib/libdrm/mk/man/drm-memory.7
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH DRM-MEMORY 7 "September 2012" "" "Direct Rendering Manager"
-.SH NAME
-drm-memory \- DRM Memory Management
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "DRM-MEMORY" 7 "September 2012" "" "Direct Rendering Manager"
+.SH NAME
+drm-memory \- DRM Memory Management
 .SH SYNOPSIS
 .sp
 \fB#include <xf86drm.h>\fP
@@ -198,25 +198,10 @@ rendering, cursors and CPU\-access. See the libgbm library for more information
 or look at the driver\-dependent man\-pages (for example \fBdrm\-intel\fP(7) or
 \fBdrm\-radeon\fP(7)).
 .sp
-GEM\-buffers can be closed with the \fBDRM_IOCTL_GEM_CLOSE\fP ioctl. It takes as
-argument a structure of type \fBstruct drm_gem_close\fP:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-struct drm_gem_close {
-    __u32 handle;
-    __u32 pad;
-};
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-The \fIhandle\fP field is the GEM\-handle to be closed. The \fIpad\fP field is unused
-padding. It must be zeroed. After this call the GEM handle cannot be used by
-this process anymore and may be reused for new GEM objects by the GEM API.
+GEM\-buffers can be closed with \fBdrmCloseBufferHandle\fP(3). It takes as
+argument the GEM\-handle to be closed. After this call the GEM handle cannot be
+used by this process anymore and may be reused for new GEM objects by the GEM
+API.
 .sp
 If you want to share GEM\-objects between different processes, you can create a
 name for them and pass this name to other processes which can then open this
diff --git a/lib/libdrm/mk/man/drm.7 b/lib/libdrm/mk/man/drm.7
index fb70e290f..9fe47162d 100644
--- a/lib/libdrm/mk/man/drm.7
+++ b/lib/libdrm/mk/man/drm.7
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH DRM 7 "September 2012" "" "Direct Rendering Manager"
-.SH NAME
-drm \- Direct Rendering Manager
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "DRM" 7 "September 2012" "" "Direct Rendering Manager"
+.SH NAME
+drm \- Direct Rendering Manager
 .SH SYNOPSIS
 .sp
 \fB#include <xf86drm.h>\fP
diff --git a/lib/libdrm/mk/man/drmAvailable.3 b/lib/libdrm/mk/man/drmAvailable.3
index 75f784af7..19a5f64c4 100644
--- a/lib/libdrm/mk/man/drmAvailable.3
+++ b/lib/libdrm/mk/man/drmAvailable.3
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH DRMAVAILABLE 3 "September 2012" "" "Direct Rendering Manager"
-.SH NAME
-drmAvailable \- determine whether a DRM kernel driver has been loaded
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "DRMAVAILABLE" 3 "September 2012" "" "Direct Rendering Manager"
+.SH NAME
+drmAvailable \- determine whether a DRM kernel driver has been loaded
 .SH SYNOPSIS
 .sp
 \fB#include <xf86drm.h>\fP
diff --git a/lib/libdrm/mk/man/drmHandleEvent.3 b/lib/libdrm/mk/man/drmHandleEvent.3
index 265a7ba29..fcfc2aa44 100644
--- a/lib/libdrm/mk/man/drmHandleEvent.3
+++ b/lib/libdrm/mk/man/drmHandleEvent.3
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH DRMHANDLEEVENT 3 "September 2012" "" "Direct Rendering Manager"
-.SH NAME
-drmHandleEvent \- read and process pending DRM events
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "DRMHANDLEEVENT" 3 "September 2012" "" "Direct Rendering Manager"
+.SH NAME
+drmHandleEvent \- read and process pending DRM events
 .SH SYNOPSIS
 .sp
 \fB#include <xf86drm.h>\fP
diff --git a/lib/libdrm/mk/man/drmModeGetResources.3 b/lib/libdrm/mk/man/drmModeGetResources.3
index a50fc77e9..8034bce69 100644
--- a/lib/libdrm/mk/man/drmModeGetResources.3
+++ b/lib/libdrm/mk/man/drmModeGetResources.3
@@ -1,8 +1,5 @@
 .\" Man page generated from reStructuredText.
 .
-.TH DRMMODEGETRESOURCES 3 "September 2012" "" "Direct Rendering Manager"
-.SH NAME
-drmModeGetResources \- retrieve current display configuration information
 .
 .nr rst2man-indent-level 0
 .
@@ -30,6 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
+.TH "DRMMODEGETRESOURCES" 3 "September 2012" "" "Direct Rendering Manager"
+.SH NAME
+drmModeGetResources \- retrieve current display configuration information
 .SH SYNOPSIS
 .sp
 \fB#include <xf86drm.h>\fP