Commit 8e4e4c2f authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next 



Backmerging drm/drm-next to get the latest changes in the xlnx driver.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents a8300c46 60ba8c5b

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Christoph Hellwig <hch@lst.de> 
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>

Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -353,7 +354,8 @@ Peter Oruba <peter@oruba.de> 
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

0 → 100644
+75 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../hwmon/hwmon<i>/in0_input

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RO. Current Voltage in millivolt.



		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RW. Card reactive sustained  (PL1/Tau) power limit in microwatts.



		The power controller will throttle the operating frequency

		if the power averaged over a window (typically seconds)

		exceeds this limit.



		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_rated_max

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RO. Card default power limit (default TDP setting).



		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_max_interval

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RW. Sustained power limit interval (Tau in PL1/Tau) in

		milliseconds over which sustained power is averaged.



		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/power1_crit

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RW. Card reactive critical (I1) power limit in microwatts.



		Card reactive critical (I1) power limit in microwatts is exposed

		for client products. The power controller will throttle the

		operating frequency if the power averaged over a window exceeds

		this limit.



		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/curr1_crit

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RW. Card reactive critical (I1) power limit in milliamperes.



		Card reactive critical (I1) power limit in milliamperes is

		exposed for server products. The power controller will throttle

		the operating frequency if the power averaged over a window

		exceeds this limit.



		Only supported for particular Intel i915 graphics platforms.



What:		/sys/devices/.../hwmon/hwmon<i>/energy1_input

Date:		February 2023

KernelVersion:	6.2

Contact:	intel-gfx@lists.freedesktop.org

Description:	RO. Energy input of device or gt in microjoules.



		For i915 device level hwmon devices (name "i915") this

		reflects energy input for the entire device. For gt level

		hwmon devices (name "i915_gtN") this reflects energy input

		for the gt.



		Only supported for particular Intel i915 graphics platforms.

Documentation/admin-guide/acpi/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ the Linux ACPI support. 
   :maxdepth: 1



   initrd_table_override

   dsdt-override

   ssdt-overlays

   cppc_sysfs

   fan_performance_states

Documentation/admin-guide/device-mapper/verity.rst

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ root_hash_sig_key_desc <key_description> 
    also gain new certificates at run time if they are signed by a certificate

    already in the secondary trusted keyring.



try_verify_in_tasklet

    If verity hashes are in cache, verify data blocks in kernel tasklet instead

    of workqueue. This option can reduce IO latency.



Theory of operation

===================

Documentation/block/ublk.rst

+36 −0
Original line number Diff line number Diff line
@@ -144,6 +144,42 @@ managing and controlling ublk devices with help of several control commands: 
  For retrieving device info via ``ublksrv_ctrl_dev_info``. It is the server's

  responsibility to save IO target specific info in userspace.



- ``UBLK_CMD_START_USER_RECOVERY``



  This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This

  command is accepted after the old process has exited, ublk device is quiesced

  and ``/dev/ublkc*`` is released. User should send this command before he starts

  a new process which re-opens ``/dev/ublkc*``. When this command returns, the

  ublk device is ready for the new process.



- ``UBLK_CMD_END_USER_RECOVERY``



  This command is valid if ``UBLK_F_USER_RECOVERY`` feature is enabled. This

  command is accepted after ublk device is quiesced and a new process has

  opened ``/dev/ublkc*`` and get all ublk queues be ready. When this command

  returns, ublk device is unquiesced and new I/O requests are passed to the

  new process.



- user recovery feature description



  Two new features are added for user recovery: ``UBLK_F_USER_RECOVERY`` and

  ``UBLK_F_USER_RECOVERY_REISSUE``.



  With ``UBLK_F_USER_RECOVERY`` set, after one ubq_daemon(ublk server's io

  handler) is dying, ublk does not delete ``/dev/ublkb*`` during the whole

  recovery stage and ublk device ID is kept. It is ublk server's

  responsibility to recover the device context by its own knowledge.

  Requests which have not been issued to userspace are requeued. Requests

  which have been issued to userspace are aborted.



  With ``UBLK_F_USER_RECOVERY_REISSUE`` set, after one ubq_daemon(ublk

  server's io handler) is dying, contrary to ``UBLK_F_USER_RECOVERY``,

  requests which have been issued to userspace are requeued and will be

  re-issued to the new process after handling ``UBLK_CMD_END_USER_RECOVERY``.

  ``UBLK_F_USER_RECOVERY_REISSUE`` is designed for backends who tolerate

  double-write since the driver may issue the same I/O request twice. It

  might be useful to a read-only FS or a VM backend.



Data plane

----------