Commit 0f94e51b authored by Thomas Hellström's avatar Thomas Hellström
Browse files

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



Backmerging to bring in a needed dependency for the Xe VFIO
driver variant. This should ideally have been done before we
commited that, so we now have a small window in drm-xe-next
where that driver doesn't compile.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202512030331.I8CveRre-lkp@intel.com/


Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parents 43109e39 0692602d

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ ForEachMacros: 
  - 'drm_connector_for_each_possible_encoder'

  - 'drm_exec_for_each_locked_object'

  - 'drm_exec_for_each_locked_object_reverse'

  - 'drm_for_each_bridge_in_chain'

  - 'drm_for_each_bridge_in_chain_scoped'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'

  - 'drm_for_each_crtc_reverse'

.mailmap

+8 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk> 
Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>

Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -173,6 +174,7 @@ Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu> 
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

Chao Yu <chao@kernel.org> <yuchao0@huawei.com>

Chen-Yu Tsai <wens@kernel.org> <wens@csie.org>

Chester Lin <chester62515@gmail.com> <clin@suse.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
@@ -205,6 +207,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com> 
David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Hildenbrand <david@kernel.org> <david@redhat.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -227,6 +230,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com> 
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Domen Puncer <domen@coderock.org>

Dong Aisheng <aisheng.dong@nxp.com> <b29396@freescale.com>

Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>
@@ -424,7 +428,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -604,7 +608,8 @@ Oleksij Rempel <o.rempel@pengutronix.de> 
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
@@ -643,6 +648,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com> 
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

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

Rae Moar <raemoar63@gmail.com> <rmoar@google.com>

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

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a 
S: 602 00 Brno

S: Czech Republic



N: Karsten Keil

E: isdn@linux-pingi.de

D: ISDN subsystem maintainer



N: Jakob Kemi

E: jakob.kemi@telia.com

D: V4L W9966 Webcam driver

Documentation/ABI/stable/sysfs-driver-qaic

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/bus/pci/drivers/qaic/XXXX:XX:XX.X/accel/accel<minor_nr>/dbc<N>_state

Date:		October 2025

KernelVersion:	6.19

Contact:	Jeff Hugo <jeff.hugo@oss.qualcomm.com>

Description:	Represents the current state of DMA Bridge channel (DBC). Below are the possible

		states:



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

		IDLE (0)		DBC is free and can be activated

		ASSIGNED (1)		DBC is activated and a workload is running on device

		BEFORE_SHUTDOWN (2)	Sub-system associated with this workload has crashed and

					it will shutdown soon

		AFTER_SHUTDOWN (3)	Sub-system associated with this workload has crashed and

					it has shutdown

		BEFORE_POWER_UP (4)	Sub-system associated with this workload is shutdown and

					it will be powered up soon

		AFTER_POWER_UP (5)	Sub-system associated with this workload is now powered up

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

Users:		Any userspace application or clients interested in DBC state.

Documentation/accel/qaic/aic100.rst

+23 −2
Original line number Diff line number Diff line
@@ -487,8 +487,8 @@ one user crashes, the fallout of that should be limited to that workload and not 
impact other workloads. SSR accomplishes this.



If a particular workload crashes, QSM notifies the host via the QAIC_SSR MHI

channel. This notification identifies the workload by it's assigned DBC. A

multi-stage recovery process is then used to cleanup both sides, and get the

channel. This notification identifies the workload by its assigned DBC. A

multi-stage recovery process is then used to cleanup both sides, and gets the

DBC/NSPs into a working state.



When SSR occurs, any state in the workload is lost. Any inputs that were in
@@ -496,6 +496,27 @@ process, or queued by not yet serviced, are lost. The loaded artifacts will 
remain in on-card DDR, but the host will need to re-activate the workload if

it desires to recover the workload.



When SSR occurs for a specific NSP, the assigned DBC goes through the

following state transactions in order:



DBC_STATE_BEFORE_SHUTDOWN

	Indicates that the affected NSP was found in an unrecoverable error

	condition.

DBC_STATE_AFTER_SHUTDOWN

	Indicates that the NSP is under reset.

DBC_STATE_BEFORE_POWER_UP

	Indicates that the NSP's debug information has been collected, and is

	ready to be collected by the host (if desired). At that stage the NSP

	is restarted by QSM.

DBC_STATE_AFTER_POWER_UP

	Indicates that the NSP has been restarted, fully operational and is

	in idle state.



SSR also has an optional crashdump collection feature. If enabled, the host can

collect the memory dump for the crashed NSP and dump it to the user space via

the dev_coredump subsystem. The host can also decline the crashdump collection

request from the device.



Reliability, Accessibility, Serviceability (RAS)

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