History

Merge tag 'v6.8-rc4' into gpio/for-next

Linux 6.8-rc4 Pulling this for a bugfix upstream with which the gpio/for-next branch conflicts.

Bartosz Golaszewski committed 2 years ago

Commit 104e00b2 parents aab5c6f 841c3511138 files · +12223 −6875Browse files

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

Unified · Split

4 files
  1. include/uapi/drm/ivpu_accel.h +21 −5
  2. include/uapi/linux/btrfs.h +3 −0
  3. include/uapi/linux/netfilter/nf_tables.h +2 −0
  4. include/uapi/linux/serial.h +7 −6
include/uapi/drm/ivpu_accel.h+21−5
@@ -53,7 +53,7 @@ extern "C" { · 52 unmodified lines
53#define DRM_IVPU_PARAM_CORE_CLOCK_RATE 353#define DRM_IVPU_PARAM_CORE_CLOCK_RATE 3
54#define DRM_IVPU_PARAM_NUM_CONTEXTS 454#define DRM_IVPU_PARAM_NUM_CONTEXTS 4
55#define DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS 555#define DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS 5
56#define DRM_IVPU_PARAM_CONTEXT_PRIORITY 656#define DRM_IVPU_PARAM_CONTEXT_PRIORITY 6 /* Deprecated */
57#define DRM_IVPU_PARAM_CONTEXT_ID 757#define DRM_IVPU_PARAM_CONTEXT_ID 7
58#define DRM_IVPU_PARAM_FW_API_VERSION 858#define DRM_IVPU_PARAM_FW_API_VERSION 8
59#define DRM_IVPU_PARAM_ENGINE_HEARTBEAT 959#define DRM_IVPU_PARAM_ENGINE_HEARTBEAT 9
@@ -64,11 +64,18 @@ extern "C" { · 4 unmodified lines
64 64
65#define DRM_IVPU_PLATFORM_TYPE_SILICON 065#define DRM_IVPU_PLATFORM_TYPE_SILICON 0
66 66
67/* Deprecated, use DRM_IVPU_JOB_PRIORITY */
67#define DRM_IVPU_CONTEXT_PRIORITY_IDLE 068#define DRM_IVPU_CONTEXT_PRIORITY_IDLE 0
68#define DRM_IVPU_CONTEXT_PRIORITY_NORMAL 169#define DRM_IVPU_CONTEXT_PRIORITY_NORMAL 1
69#define DRM_IVPU_CONTEXT_PRIORITY_FOCUS 270#define DRM_IVPU_CONTEXT_PRIORITY_FOCUS 2
70#define DRM_IVPU_CONTEXT_PRIORITY_REALTIME 371#define DRM_IVPU_CONTEXT_PRIORITY_REALTIME 3
71 72
73#define DRM_IVPU_JOB_PRIORITY_DEFAULT 0
74#define DRM_IVPU_JOB_PRIORITY_IDLE 1
75#define DRM_IVPU_JOB_PRIORITY_NORMAL 2
76#define DRM_IVPU_JOB_PRIORITY_FOCUS 3
77#define DRM_IVPU_JOB_PRIORITY_REALTIME 4
78
72/**79/**
73 * DRM_IVPU_CAP_METRIC_STREAMER80 * DRM_IVPU_CAP_METRIC_STREAMER
74 *81 *
@@ -112,10 +119,6 @@ struct drm_ivpu_param { · 37 unmodified lines
112 * %DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:119 * %DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS:
113 * Lowest VPU virtual address available in the current context (read-only)120 * Lowest VPU virtual address available in the current context (read-only)
114 *121 *
115 * %DRM_IVPU_PARAM_CONTEXT_PRIORITY:
116 * Value of current context scheduling priority (read-write).
117 * See DRM_IVPU_CONTEXT_PRIORITY_* for possible values.
118 *
119 * %DRM_IVPU_PARAM_CONTEXT_ID:122 * %DRM_IVPU_PARAM_CONTEXT_ID:
120 * Current context ID, always greater than 0 (read-only)123 * Current context ID, always greater than 0 (read-only)
121 *124 *
@@ -286,10 +289,23 @@ struct drm_ivpu_submit { · 164 unmodified lines
286 * to be executed. The offset has to be 8-byte aligned.289 * to be executed. The offset has to be 8-byte aligned.
287 */290 */
288 __u32 commands_offset;291 __u32 commands_offset;
292
293 /**
294 * @priority:
295 *
296 * Priority to be set for related job command queue, can be one of the following:
297 * %DRM_IVPU_JOB_PRIORITY_DEFAULT
298 * %DRM_IVPU_JOB_PRIORITY_IDLE
299 * %DRM_IVPU_JOB_PRIORITY_NORMAL
300 * %DRM_IVPU_JOB_PRIORITY_FOCUS
301 * %DRM_IVPU_JOB_PRIORITY_REALTIME
302 */
303 __u32 priority;
289};304};
290 305
291/* drm_ivpu_bo_wait job status codes */306/* drm_ivpu_bo_wait job status codes */
292#define DRM_IVPU_JOB_STATUS_SUCCESS 0307#define DRM_IVPU_JOB_STATUS_SUCCESS 0
308#define DRM_IVPU_JOB_STATUS_ABORTED 256
293 309
294/**310/**
295 * struct drm_ivpu_bo_wait - Wait for BO to become inactive311 * struct drm_ivpu_bo_wait - Wait for BO to become inactive
include/uapi/linux/btrfs.h+3−0
@@ -614,6 +614,9 @@ struct btrfs_ioctl_clone_range_args { · 613 unmodified lines
614 */614 */
615#define BTRFS_DEFRAG_RANGE_COMPRESS 1615#define BTRFS_DEFRAG_RANGE_COMPRESS 1
616#define BTRFS_DEFRAG_RANGE_START_IO 2616#define BTRFS_DEFRAG_RANGE_START_IO 2
617#define BTRFS_DEFRAG_RANGE_FLAGS_SUPP (BTRFS_DEFRAG_RANGE_COMPRESS | \
618 BTRFS_DEFRAG_RANGE_START_IO)
619
617struct btrfs_ioctl_defrag_range_args {620struct btrfs_ioctl_defrag_range_args {
618 /* start of the defrag operation */621 /* start of the defrag operation */
619 __u64 start;622 __u64 start;
include/uapi/linux/netfilter/nf_tables.h+2−0
@@ -285,9 +285,11 @@ enum nft_rule_attributes { · 284 unmodified lines
285/**285/**
286 * enum nft_rule_compat_flags - nf_tables rule compat flags286 * enum nft_rule_compat_flags - nf_tables rule compat flags
287 *287 *
288 * @NFT_RULE_COMPAT_F_UNUSED: unused
288 * @NFT_RULE_COMPAT_F_INV: invert the check result289 * @NFT_RULE_COMPAT_F_INV: invert the check result
289 */290 */
290enum nft_rule_compat_flags {291enum nft_rule_compat_flags {
292 NFT_RULE_COMPAT_F_UNUSED = (1 << 0),
291 NFT_RULE_COMPAT_F_INV = (1 << 1),293 NFT_RULE_COMPAT_F_INV = (1 << 1),
292 NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV,294 NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV,
293};295};
include/uapi/linux/serial.h+7−6
@@ -145,12 +145,13 @@ struct serial_rs485 { · 144 unmodified lines
145#define SER_RS485_ENABLED _BITUL(0)145#define SER_RS485_ENABLED _BITUL(0)
146#define SER_RS485_RTS_ON_SEND _BITUL(1)146#define SER_RS485_RTS_ON_SEND _BITUL(1)
147#define SER_RS485_RTS_AFTER_SEND _BITUL(2)147#define SER_RS485_RTS_AFTER_SEND _BITUL(2)
148#define SER_RS485_RX_DURING_TX _BITUL(3)148/* Placeholder for bit 3: SER_RS485_RTS_BEFORE_SEND, which isn't used anymore */
149#define SER_RS485_TERMINATE_BUS _BITUL(4)149#define SER_RS485_RX_DURING_TX _BITUL(4)
150#define SER_RS485_ADDRB _BITUL(5)150#define SER_RS485_TERMINATE_BUS _BITUL(5)
151#define SER_RS485_ADDR_RECV _BITUL(6)151#define SER_RS485_ADDRB _BITUL(6)
152#define SER_RS485_ADDR_DEST _BITUL(7)152#define SER_RS485_ADDR_RECV _BITUL(7)
153#define SER_RS485_MODE_RS422 _BITUL(8)153#define SER_RS485_ADDR_DEST _BITUL(8)
154#define SER_RS485_MODE_RS422 _BITUL(9)
154 155
155 __u32 delay_rts_before_send;156 __u32 delay_rts_before_send;
156 __u32 delay_rts_after_send;157 __u32 delay_rts_after_send;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t