Skip to content

Commit 1041dfe

Browse files
committed
tools headers UAPI: Update tools's copy of drm headers
tldr; Just FYI, I'm carrying this on the perf tools tree. Full explanation: There used to be no copies, with tools/ code using kernel headers directly. From time to time tools/perf/ broke due to legitimate kernel hacking. At some point Linus complained about such direct usage. Then we adopted the current model. The way these headers are used in perf are not restricted to just including them to compile something. There are sometimes used in scripts that convert defines into string tables, etc, so some change may break one of these scripts, or new MSRs may use some different #define pattern, etc. E.g.: $ ls -1 tools/perf/trace/beauty/*.sh | head -5 tools/perf/trace/beauty/arch_errno_names.sh tools/perf/trace/beauty/drm_ioctl.sh tools/perf/trace/beauty/fadvise.sh tools/perf/trace/beauty/fsconfig.sh tools/perf/trace/beauty/fsmount.sh $ $ tools/perf/trace/beauty/fadvise.sh static const char *fadvise_advices[] = { [0] = "NORMAL", [1] = "RANDOM", [2] = "SEQUENTIAL", [3] = "WILLNEED", [4] = "DONTNEED", [5] = "NOREUSE", }; $ The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files. So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers. Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: Thomas Zimmermann <[email protected]> Cc: [email protected] Signed-off-by: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 29b8e94 commit 1041dfe

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

tools/include/uapi/drm/drm.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,26 @@ extern "C" {
11341134
#define DRM_IOCTL_MODE_PAGE_FLIP DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
11351135
#define DRM_IOCTL_MODE_DIRTYFB DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)
11361136

1137+
/**
1138+
* DRM_IOCTL_MODE_CREATE_DUMB - Create a new dumb buffer object.
1139+
*
1140+
* KMS dumb buffers provide a very primitive way to allocate a buffer object
1141+
* suitable for scanout and map it for software rendering. KMS dumb buffers are
1142+
* not suitable for hardware-accelerated rendering nor video decoding. KMS dumb
1143+
* buffers are not suitable to be displayed on any other device than the KMS
1144+
* device where they were allocated from. Also see
1145+
* :ref:`kms_dumb_buffer_objects`.
1146+
*
1147+
* The IOCTL argument is a struct drm_mode_create_dumb.
1148+
*
1149+
* User-space is expected to create a KMS dumb buffer via this IOCTL, then add
1150+
* it as a KMS framebuffer via &DRM_IOCTL_MODE_ADDFB and map it via
1151+
* &DRM_IOCTL_MODE_MAP_DUMB.
1152+
*
1153+
* &DRM_CAP_DUMB_BUFFER indicates whether this IOCTL is supported.
1154+
* &DRM_CAP_DUMB_PREFERRED_DEPTH and &DRM_CAP_DUMB_PREFER_SHADOW indicate
1155+
* driver preferences for dumb buffers.
1156+
*/
11371157
#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb)
11381158
#define DRM_IOCTL_MODE_MAP_DUMB DRM_IOWR(0xB3, struct drm_mode_map_dumb)
11391159
#define DRM_IOCTL_MODE_DESTROY_DUMB DRM_IOWR(0xB4, struct drm_mode_destroy_dumb)

tools/include/uapi/drm/i915_drm.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ extern "C" {
3838
*/
3939

4040
/**
41-
* DOC: uevents generated by i915 on it's device node
41+
* DOC: uevents generated by i915 on its device node
4242
*
4343
* I915_L3_PARITY_UEVENT - Generated when the driver receives a parity mismatch
44-
* event from the gpu l3 cache. Additional information supplied is ROW,
44+
* event from the GPU L3 cache. Additional information supplied is ROW,
4545
* BANK, SUBBANK, SLICE of the affected cacheline. Userspace should keep
46-
* track of these events and if a specific cache-line seems to have a
47-
* persistent error remap it with the l3 remapping tool supplied in
46+
* track of these events, and if a specific cache-line seems to have a
47+
* persistent error, remap it with the L3 remapping tool supplied in
4848
* intel-gpu-tools. The value supplied with the event is always 1.
4949
*
5050
* I915_ERROR_UEVENT - Generated upon error detection, currently only via

0 commit comments

Comments
 (0)