Commit ca31fef1 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

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



Required bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parents ba6cd766 15d27b15

.clang-format

+11 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ ForEachMacros: 
  - 'css_for_each_child'

  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'cxl_for_each_cmd'

  - 'device_for_each_child_node'

  - 'displayid_iter_for_each'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

  - 'drm_atomic_crtc_for_each_plane'
@@ -136,6 +136,7 @@ ForEachMacros: 
  - 'drm_mm_for_each_node_in_range'

  - 'drm_mm_for_each_node_safe'

  - 'flow_action_for_each'

  - 'for_each_acpi_dev_match'

  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'
@@ -171,7 +172,6 @@ ForEachMacros: 
  - 'for_each_dapm_widgets'

  - 'for_each_dev_addr'

  - 'for_each_dev_scope'

  - 'for_each_displayid_db'

  - 'for_each_dma_cap_mask'

  - 'for_each_dpcm_be'

  - 'for_each_dpcm_be_rollback'
@@ -179,6 +179,7 @@ ForEachMacros: 
  - 'for_each_dpcm_fe'

  - 'for_each_drhd_unit'

  - 'for_each_dss_dev'

  - 'for_each_dtpm_table'

  - 'for_each_efi_memory_desc'

  - 'for_each_efi_memory_desc_in_map'

  - 'for_each_element'
@@ -215,6 +216,7 @@ ForEachMacros: 
  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_msi_vector'

  - 'for_each_net'

  - 'for_each_net_continue_reverse'

  - 'for_each_netdev'
@@ -270,6 +272,12 @@ ForEachMacros: 
  - 'for_each_prime_number_from'

  - 'for_each_process'

  - 'for_each_process_thread'

  - 'for_each_prop_codec_conf'

  - 'for_each_prop_dai_codec'

  - 'for_each_prop_dai_cpu'

  - 'for_each_prop_dlc_codecs'

  - 'for_each_prop_dlc_cpus'

  - 'for_each_prop_dlc_platforms'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_requested_gpio'
@@ -430,6 +438,7 @@ ForEachMacros: 
  - 'queue_for_each_hw_ctx'

  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rb_for_each'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_block'

  - 'rdma_for_each_port'

.mailmap

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Felipe W Damasio <felipewd@terra.com.br> 
Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
@@ -212,6 +213,8 @@ Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com> 
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>

Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>

Mark Brown <broonie@sirena.org.uk>

Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
@@ -243,6 +246,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Michel Lespinasse <michel@lespinasse.org>

Michel Lespinasse <michel@lespinasse.org> <walken@google.com>

Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>

Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Documentation/ABI/obsolete/sysfs-bus-iio

0 → 100644
+182 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/buffer/length

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Number of scans contained by the buffer.



		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:

			/sys/bus/iio/devices/iio:deviceX/bufferY/length



What:		/sys/bus/iio/devices/iio:deviceX/buffer/enable

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Actually start the buffer capture up.  Will start trigger

		if first device and appropriate.



		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:

			/sys/bus/iio/devices/iio:deviceX/bufferY/enable



What:		/sys/bus/iio/devices/iio:deviceX/scan_elements

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Directory containing interfaces for elements that will be

		captured for a single triggered sample set in the buffer.



		Since kernel 5.11 the scan_elements attributes are merged into

		the bufferY directory, to be configurable per buffer.



What:		/sys/.../iio:deviceX/scan_elements/in_accel_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_accel_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_accel_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_i_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_q_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_i_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_q_en

What:		/sys/.../iio:deviceX/scan_elements/in_incli_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en

What:		/sys/.../iio:deviceX/scan_elements/in_proximity_en

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Scan element control for triggered data capture.



		Since kernel 5.11 the scan_elements attributes are merged into

		the bufferY directory, to be configurable per buffer.



What:		/sys/.../iio:deviceX/scan_elements/in_accel_type

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_type

What:		/sys/.../iio:deviceX/scan_elements/in_magn_type

What:		/sys/.../iio:deviceX/scan_elements/in_incli_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_i_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_q_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_i_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_q_type

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_type

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type

What:		/sys/.../iio:deviceX/scan_elements/in_proximity_type

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Description of the scan element data storage within the buffer

		and hence the form in which it is read from user-space.

		Form is [be|le]:[s|u]bits/storagebits[>>shift].

		be or le specifies big or little endian. s or u specifies if

		signed (2's complement) or unsigned. bits is the number of bits

		of data and storagebits is the space (after padding) that it

		occupies in the buffer. shift if specified, is the shift that

		needs to be applied prior to masking out unused bits. Some

		devices put their data in the middle of the transferred elements

		with additional information on both sides.  Note that some

		devices will have additional information in the unused bits

		so to get a clean value, the bits value must be used to mask

		the buffer output value appropriately.  The storagebits value

		also specifies the data alignment.  So s48/64>>2 will be a

		signed 48 bit integer stored in a 64 bit location aligned to

		a 64 bit boundary. To obtain the clean value, shift right 2

		and apply a mask to zero the top 16 bits of the result.

		For other storage combinations this attribute will be extended

		appropriately.



		Since kernel 5.11 the scan_elements attributes are merged into

		the bufferY directory, to be configurable per buffer.



What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_i_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_q_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_i_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_q_index

What:		/sys/.../iio:deviceX/scan_elements/in_accel_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_accel_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_accel_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index

What:		/sys/.../iio:deviceX/scan_elements/in_incli_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index

What:		/sys/.../iio:deviceX/scan_elements/in_proximity_index

KernelVersion:	2.6.37

Description:

		A single positive integer specifying the position of this

		scan element in the buffer. Note these are not dependent on

		what is enabled and may not be contiguous. Thus for user-space

		to establish the full layout these must be used in conjunction

		with all _en attributes to establish which channels are present,

		and the relevant _type attributes to establish the data storage

		format.



		Since kernel 5.11 the scan_elements attributes are merged into

		the bufferY directory, to be configurable per buffer.



What:		/sys/bus/iio/devices/iio:deviceX/buffer/watermark

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

		A single positive integer specifying the maximum number of scan

		elements to wait for.



		Poll will block until the watermark is reached.



		Blocking read will wait until the minimum between the requested

		read amount or the low water mark is available.



		Non-blocking read will retrieve the available samples from the

		buffer even if there are less samples then watermark level. This

		allows the application to block on poll with a timeout and read

		the available samples after the timeout expires and thus have a

		maximum delay guarantee.



		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:

			/sys/bus/iio/devices/iio:deviceX/bufferY/watermark



What:		/sys/bus/iio/devices/iio:deviceX/buffer/data_available

KernelVersion: 4.16

Contact:	linux-iio@vger.kernel.org

Description:

		A read-only value indicating the bytes of data available in the

		buffer. In the case of an output buffer, this indicates the

		amount of empty space available to write data to. In the case of

		an input buffer, this indicates the amount of data available for

		reading.



		Since Kernel 5.11, multiple buffers are supported.

		so, it is better to use, instead:

			/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

Documentation/ABI/obsolete/sysfs-cpuidle

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ Description: 
	with the update that cpuidle governor can be changed at runtime in default,

	both current_governor and current_governor_ro co-exist under

	/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make

	current_governor_ro obselete.
 
	current_governor_ro obsolete.

Documentation/ABI/removed/sysfs-kernel-uids

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Contact: Dhaval Giani <dhaval@linux.vnet.ibm.com> 
Description:

		The /sys/kernel/uids/<uid>/cpu_shares tunable is used

		to set the cpu bandwidth a user is allowed. This is a

		propotional value. What that means is that if there

		proportional value. What that means is that if there

		are two users logged in, each with an equal number of

		shares, then they will get equal CPU bandwidth. Another

		example would be, if User A has shares = 1024 and user