History

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh backmerge of drm-next to pull it in.

Maarten Lankhorst committed 7 years ago

Commit bcb74162 parents 90b2df5 52d2d4412204 files · +20633 −101122Browse files

Showing the changes to include/uapi (4 of 12204 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/fuse.h +6 −1
  3. include/uapi/misc/habanalabs.h +20 −2
  4. include/uapi/sound/sof/abi.h +1 −1
include/uapi/linux/Kbuild+1−0
@@ -1,3 +1,4 @@
1# SPDX-License-Identifier: GPL-2.0
1ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)2ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
2no-export-headers += a.out.h3no-export-headers += a.out.h
3endif4endif
include/uapi/linux/fuse.h+6−1
@@ -130,6 +130,9 @@ · 129 unmodified lines
130 * 7.30130 * 7.30
131 * - add FUSE_EXPLICIT_INVAL_DATA131 * - add FUSE_EXPLICIT_INVAL_DATA
132 * - add FUSE_IOCTL_COMPAT_X32132 * - add FUSE_IOCTL_COMPAT_X32
133 *
134 * 7.31
135 * - add FUSE_WRITE_KILL_PRIV flag
133 */136 */
134 137
135#ifndef _LINUX_FUSE_H138#ifndef _LINUX_FUSE_H
@@ -165,7 +168,7 @@ · 29 unmodified lines
165#define FUSE_KERNEL_VERSION 7168#define FUSE_KERNEL_VERSION 7
166 169
167/** Minor version number of this interface */170/** Minor version number of this interface */
168#define FUSE_KERNEL_MINOR_VERSION 30171#define FUSE_KERNEL_MINOR_VERSION 31
169 172
170/** The node ID of the root inode */173/** The node ID of the root inode */
171#define FUSE_ROOT_ID 1174#define FUSE_ROOT_ID 1
@@ -327,9 +330,11 @@ struct fuse_file_lock { · 155 unmodified lines
327 *330 *
328 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed331 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
329 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid332 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
333 * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits
330 */334 */
331#define FUSE_WRITE_CACHE (1 << 0)335#define FUSE_WRITE_CACHE (1 << 0)
332#define FUSE_WRITE_LOCKOWNER (1 << 1)336#define FUSE_WRITE_LOCKOWNER (1 << 1)
337#define FUSE_WRITE_KILL_PRIV (1 << 2)
333 338
334/**339/**
335 * Read flags340 * Read flags
include/uapi/misc/habanalabs.h+20−2
@@ -413,6 +413,10 @@ struct hl_debug_params_spmu { · 412 unmodified lines
413#define HL_DEBUG_OP_SPMU 5413#define HL_DEBUG_OP_SPMU 5
414/* Opcode for timestamp */414/* Opcode for timestamp */
415#define HL_DEBUG_OP_TIMESTAMP 6415#define HL_DEBUG_OP_TIMESTAMP 6
416/* Opcode for setting the device into or out of debug mode. The enable
417 * variable should be 1 for enabling debug mode and 0 for disabling it
418 */
419#define HL_DEBUG_OP_SET_MODE 7
416 420
417struct hl_debug_args {421struct hl_debug_args {
418 /*422 /*
@@ -574,8 +578,22 @@ struct hl_debug_args { · 155 unmodified lines
574 *578 *
575 * This IOCTL allows the user to get debug traces from the chip.579 * This IOCTL allows the user to get debug traces from the chip.
576 *580 *
577 * The user needs to provide the register index and essential data such as581 * Before the user can send configuration requests of the various
578 * buffer address and size.582 * debug/profile engines, it needs to set the device into debug mode.
583 * This is because the debug/profile infrastructure is shared component in the
584 * device and we can't allow multiple users to access it at the same time.
585 *
586 * Once a user set the device into debug mode, the driver won't allow other
587 * users to "work" with the device, i.e. open a FD. If there are multiple users
588 * opened on the device, the driver won't allow any user to debug the device.
589 *
590 * For each configuration request, the user needs to provide the register index
591 * and essential data such as buffer address and size.
592 *
593 * Once the user has finished using the debug/profile engines, he should
594 * set the device into non-debug mode, i.e. disable debug mode.
595 *
596 * The driver can decide to "kick out" the user if he abuses this interface.
579 *597 *
580 */598 */
581#define HL_IOCTL_DEBUG \599#define HL_IOCTL_DEBUG \
include/uapi/sound/sof/abi.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 26
27/* SOF ABI version major, minor and patch numbers */27/* SOF ABI version major, minor and patch numbers */
28#define SOF_ABI_MAJOR 328#define SOF_ABI_MAJOR 3
29#define SOF_ABI_MINOR 429#define SOF_ABI_MINOR 6
30#define SOF_ABI_PATCH 030#define SOF_ABI_PATCH 0
31 31
32/* SOF ABI version number. Format within 32bit word is MMmmmppp */32/* SOF ABI version number. Format within 32bit word is MMmmmppp */