-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge drm/drm-next into drm-intel-gt-next
Work that needs to land in drm-intel-gt-next depends on two patches only present in drm-intel-next, absence of which is causing a merge conflict: 3b918f4 ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete") Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
- Loading branch information
Showing
15,467 changed files
with
787,365 additions
and
256,580 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,7 +74,7 @@ modules.order | |
# | ||
# RPM spec file (make rpm-pkg) | ||
# | ||
/*.spec | ||
/kernel.spec | ||
/rpmbuild/ | ||
|
||
# | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
What: /config/usb-gadget/gadget/functions/midi2.name | ||
Date: Jul 2023 | ||
KernelVersion: 6.6 | ||
Description: | ||
The attributes: | ||
|
||
============ =============================================== | ||
process_ump Flag to process UMP Stream messages (0 or 1) | ||
static_block Flag for static blocks (0 or 1) | ||
iface_name MIDI interface name string | ||
============ =============================================== | ||
|
||
What: /config/usb-gadget/gadget/functions/midi2.name/ep.number | ||
Date: Jul 2023 | ||
KernelVersion: 6.6 | ||
Description: | ||
This group contains a UMP Endpoint configuration. | ||
A new Endpoint starts from 0, and can be up to 3. | ||
|
||
The attributes: | ||
|
||
============= =============================================== | ||
protocol_caps MIDI protocol capabilities (1, 2 or 3 for both) | ||
protocol Default MIDI protocol (1 or 2) | ||
ep_name UMP Endpoint name string | ||
product_id Product ID string | ||
manufacturer Manufacture ID (24 bit) | ||
family Device family ID (16 bit) | ||
model Device model ID (16 bit) | ||
sw_revision Software Revision (32 bit) | ||
============= =============================================== | ||
|
||
What: /config/usb-gadget/gadget/functions/midi2.name/ep.number/block.number | ||
Date: Jul 2023 | ||
KernelVersion: 6.6 | ||
Description: | ||
This group contains a UMP Function Block configuration. | ||
A new block starts from 0, and can be up to 31. | ||
|
||
The attributes: | ||
|
||
================= ============================================== | ||
name Function Block name string | ||
direction 1: input, 2: output, 3: bidirectional | ||
first_group The first UMP Group number (0-15) | ||
num_groups The number of groups in this FB (1-16) | ||
midi1_first_group The first UMP Group number for MIDI 1.0 (0-15) | ||
midi1_num_groups The number of groups for MIDI 1.0 (0-16) | ||
ui_hint 0: unknown, 1: receiver, 2: sender, 3: both | ||
midi_ci_verison Supported MIDI-CI version number (8 bit) | ||
is_midi1 Legacy MIDI 1.0 device (0, 1 or 2) | ||
sysex8_streams Max number of SysEx8 streams (8 bit) | ||
active Active FB flag (0 or 1) | ||
================= ============================================== |
Oops, something went wrong.