Commit 9d527c4f authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

Merge drm/drm-next into drm-xe-next 



Sync with drm-misc-next which is necessary for changes in gpuvm
and gpusvm that will be used in xe.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parents 41be792f 1cd0c7af

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ Casey Connolly <casey.connolly@linaro.org> <caleb@connolly.tech> 
Casey Connolly <casey.connolly@linaro.org> <caleb@postmarketos.org>

Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>

Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>

Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <carlv@codeaurora.org>

Carl Vanderlip <carl.vanderlip@oss.qualcomm.com> <quic_carlv@quicinc.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>

Documentation/ABI/stable/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ Contact: linux-block@vger.kernel.org 
Description:

		[RW] If the device is registered for writeback throttling, then

		this file shows the target minimum read latency. If this latency

		is exceeded in a given window of time (see wb_window_usec), then

		is exceeded in a given window of time (see curr_win_nsec), then

		the writeback throttling will start scaling back writes. Writing

		a value of '0' to this file disables the feature. Writing a

		value of '-1' to this file resets the value to the default

Documentation/accel/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Compute Accelerators 
   introduction

   amdxdna/index

   qaic/index

   rocket/index



.. only::  subproject and html

Documentation/accel/rocket/index.rst

0 → 100644
+19 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0-only



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

 accel/rocket Rockchip NPU driver

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



The accel/rocket driver supports the Neural Processing Units (NPUs) inside some

Rockchip SoCs such as the RK3588. Rockchip calls it RKNN and sometimes RKNPU.



The hardware is described in chapter 36 in the RK3588 TRM.



This driver just powers the hardware on and off, allocates and maps buffers to

the device and submits jobs to the frontend unit. Everything else is done in

userspace, as a Gallium driver (also called rocket) that is part of the Mesa3D

project.



Hardware currently supported:



* RK3588

Documentation/admin-guide/blockdev/zoned_loop.rst

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ zone_capacity_mb Device zone capacity (must always be equal to or lower than 
                   the zone size. Default: zone size.

conv_zones         Total number of conventioanl zones starting from sector 0.

                   Default: 8.

base_dir           Path to the base directoy where to create the directory

base_dir           Path to the base directory where to create the directory

                   containing the zone files of the device.

                   Default=/var/local/zloop.

                   The device directory containing the zone files is always