We need the tty/serial fixes in here as well.
Showing the changes to include/uapi (3 of 828 files). Show all
Unified · Split
| @@ -53,7 +53,7 @@ extern "C" { · 52 unmodified lines | |||
| 53 | #define DRM_IVPU_PARAM_CORE_CLOCK_RATE 3 | 53 | #define DRM_IVPU_PARAM_CORE_CLOCK_RATE 3 |
| 54 | #define DRM_IVPU_PARAM_NUM_CONTEXTS 4 | 54 | #define DRM_IVPU_PARAM_NUM_CONTEXTS 4 |
| 55 | #define DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS 5 | 55 | #define DRM_IVPU_PARAM_CONTEXT_BASE_ADDRESS 5 |
| 56 | #define DRM_IVPU_PARAM_CONTEXT_PRIORITY 6 | 56 | #define DRM_IVPU_PARAM_CONTEXT_PRIORITY 6 /* Deprecated */ |
| 57 | #define DRM_IVPU_PARAM_CONTEXT_ID 7 | 57 | #define DRM_IVPU_PARAM_CONTEXT_ID 7 |
| 58 | #define DRM_IVPU_PARAM_FW_API_VERSION 8 | 58 | #define DRM_IVPU_PARAM_FW_API_VERSION 8 |
| 59 | #define DRM_IVPU_PARAM_ENGINE_HEARTBEAT 9 | 59 | #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 0 | 65 | #define DRM_IVPU_PLATFORM_TYPE_SILICON 0 |
| 66 | 66 | ||
| 67 | /* Deprecated, use DRM_IVPU_JOB_PRIORITY */ | ||
| 67 | #define DRM_IVPU_CONTEXT_PRIORITY_IDLE 0 | 68 | #define DRM_IVPU_CONTEXT_PRIORITY_IDLE 0 |
| 68 | #define DRM_IVPU_CONTEXT_PRIORITY_NORMAL 1 | 69 | #define DRM_IVPU_CONTEXT_PRIORITY_NORMAL 1 |
| 69 | #define DRM_IVPU_CONTEXT_PRIORITY_FOCUS 2 | 70 | #define DRM_IVPU_CONTEXT_PRIORITY_FOCUS 2 |
| 70 | #define DRM_IVPU_CONTEXT_PRIORITY_REALTIME 3 | 71 | #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_STREAMER | 80 | * 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,6 +289,18 @@ 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 */ |
| @@ -614,6 +614,9 @@ struct btrfs_ioctl_clone_range_args { · 613 unmodified lines | |||
| 614 | */ | 614 | */ |
| 615 | #define BTRFS_DEFRAG_RANGE_COMPRESS 1 | 615 | #define BTRFS_DEFRAG_RANGE_COMPRESS 1 |
| 616 | #define BTRFS_DEFRAG_RANGE_START_IO 2 | 616 | #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 | |||
| 617 | struct btrfs_ioctl_defrag_range_args { | 620 | struct btrfs_ioctl_defrag_range_args { |
| 618 | /* start of the defrag operation */ | 621 | /* start of the defrag operation */ |
| 619 | __u64 start; | 622 | __u64 start; |
| @@ -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; |