From: Dave Airlie Date: Fri, 5 Apr 2024 03:15:28 +0000 (+1000) Subject: Merge tag 'drm-misc-next-2024-03-28' of https://gitlab.freedesktop.org/drm/misc/kerne... X-Git-Tag: v6.10-rc1~148^2~24 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/fee54d08bc83d1afab57d193de0724d98f050f0f?hp=-c Merge tag 'drm-misc-next-2024-03-28' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next Two misc-next in one. drm-misc-next for v6.10-rc1: The deal of a lifetime! You get ALL of the previous drm-misc-next-2024-03-21-1 tag!! But WAIT, there's MORE! Cross-subsystem Changes: - Assorted DT binding updates. Core Changes: - Clarify how optional wait_hpd_asserted is. - Shuffle Kconfig names around. Driver Changes: - Assorted build fixes for panthor, imagination, - Add AUO B120XAN01.0 panels. - Assorted small fixes to panthor, panfrost. drm-misc-next for v6.10: UAPI Changes: - Move some nouveau magic constants to uapi. Cross-subsystem Changes: - Move drm-misc to gitlab and freedesktop hosting. - Add entries for panfrost. Core Changes: - Improve placement for TTM bo's in idle/busy handling. - Improve drm/bridge init ordering. - Add CONFIG_DRM_WERROR, and use W=1 for drm. - Assorted documentation updates. - Make more (drm and driver) headers self-contained and add header guards. - Grab reservation lock in pin/unpin callbacks. - Fix reservation lock handling for vmap. - Add edp and edid panel matching, use it to fix a nearly identical panel. Driver Changes: - Add drm/panthor driver and assorted fixes. - Assorted small fixes to xlnx, panel-edp, tidss, ci, nouveau, panel and bridge drivers. - Add Samsung s6e3fa7, BOE NT116WHM-N44, CMN N116BCA-EA1, CrystalClear CMT430B19N00, Startek KD050HDFIA020-C020A, powertip PH128800T006-ZHC01 panels. - Fix console for omapdrm. Signed-off-by: Dave Airlie From: Maarten Lankhorst Link: https://patchwork.freedesktop.org/patch/msgid/bea310a6-6ff6-477e-9363-f9f053cfd12a@linux.intel.com --- fee54d08bc83d1afab57d193de0724d98f050f0f diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml index b97d298b3eb6,96e47742e250..e1b06c8819e0 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@@ -39,8 -39,6 +39,8 @@@ patternProperties description: ShenZhen Asia Better Technology Ltd. "^acbel,.*": description: Acbel Polytech Inc. + "^acelink,.*": + description: Acelink Technology Co., Ltd. "^acer,.*": description: Acer Inc. "^acme,.*": @@@ -111,8 -109,6 +111,8 @@@ description: Amlogic, Inc. "^ampere,.*": description: Ampere Computing LLC + "^amphenol,.*": + description: Amphenol Advanced Sensors "^ampire,.*": description: Ampire Co., Ltd. "^ams,.*": @@@ -165,8 -161,6 +165,8 @@@ description: ASPEED Technology Inc. "^asrock,.*": description: ASRock Inc. + "^asteralabs,.*": + description: Astera Labs, Inc. "^asus,.*": description: AsusTek Computer Inc. "^atheros,.*": @@@ -238,8 -232,6 +238,8 @@@ description: ByteDance Ltd. "^calamp,.*": description: CalAmp Corp. + "^calao,.*": + description: CALAO Systems SAS "^calaosystems,.*": description: CALAO Systems SAS "^calxeda,.*": @@@ -256,6 -248,8 +256,8 @@@ description: Catalyst Semiconductor, Inc. "^cavium,.*": description: Cavium, Inc. + "^cct,.*": + description: Crystal Clear Technology Sdn. Bhd. "^cdns,.*": description: Cadence Design Systems Inc. "^cdtech,.*": @@@ -488,9 -482,6 +490,9 @@@ description: EZchip Semiconductor "^facebook,.*": description: Facebook + "^fairchild,.*": + description: Fairchild Semiconductor (deprecated, use 'onnn') + deprecated: true "^fairphone,.*": description: Fairphone B.V. "^faraday,.*": @@@ -513,8 -504,6 +515,8 @@@ description: FocalTech Systems Co.,Ltd "^forlinx,.*": description: Baoding Forlinx Embedded Technology Co., Ltd. + "^freebox,.*": + description: Freebox SAS "^freecom,.*": description: Freecom Gmbh "^frida,.*": @@@ -557,8 -546,6 +559,8 @@@ description: Giantec Semiconductor, Inc. "^giantplus,.*": description: Giantplus Technology Co., Ltd. + "^glinet,.*": + description: GL Intelligence, Inc. "^globalscale,.*": description: Globalscale Technologies, Inc. "^globaltop,.*": @@@ -618,8 -605,6 +620,8 @@@ description: Honestar Technologies Co., Ltd. "^honeywell,.*": description: Honeywell + "^hoperf,.*": + description: Shenzhen Hope Microelectronics Co., Ltd. "^hoperun,.*": description: Jiangsu HopeRun Software Co., Ltd. "^hp,.*": @@@ -650,16 -635,12 +652,16 @@@ description: Hyundai Technology "^i2se,.*": description: I2SE GmbH + "^IBM,.*": + description: International Business Machines (IBM) "^ibm,.*": description: International Business Machines (IBM) "^icplus,.*": description: IC Plus Corp. "^idt,.*": description: Integrated Device Technologies, Inc. + "^iei,.*": + description: IEI Integration Corp. "^ifi,.*": description: Ingenieurburo Fur Ic-Technologie (I/F/I) "^ilitek,.*": @@@ -742,8 -723,6 +744,8 @@@ description: JetHome (IP Sokolov P.A.) "^jianda,.*": description: Jiandangjing Technology Co., Ltd. + "^jide,.*": + description: Jide Tech "^joz,.*": description: JOZ BV "^kam,.*": @@@ -846,8 -825,6 +848,8 @@@ description: LSI Corp. (LSI Logic) "^lunzn,.*": description: Shenzhen Lunzn Technology Co., Ltd. + "^luxul,.*": + description: Lagrand | AV "^lwn,.*": description: Liebherr-Werk Nenzing GmbH "^lxa,.*": @@@ -926,9 -903,6 +928,9 @@@ description: Miniand Tech "^minix,.*": description: MINIX Technology Ltd. + "^mips,.*": + description: MIPS Technology (deprecated, use 'mti' or 'img') + deprecated: true "^miramems,.*": description: MiraMEMS Sensing Technology Co., Ltd. "^mitsubishi,.*": @@@ -941,8 -915,6 +943,8 @@@ description: Miyoo "^mntre,.*": description: MNT Research GmbH + "^mobileye,.*": + description: Mobileye Vision Technologies Ltd. "^modtronix,.*": description: Modtronix Engineering "^moortec,.*": @@@ -1025,9 -997,6 +1027,9 @@@ description: Novatek "^novtech,.*": description: NovTech, Inc. + "^numonyx,.*": + description: Numonyx (deprecated, use micron) + deprecated: true "^nutsboard,.*": description: NutsBoard "^nuvoton,.*": @@@ -1332,8 -1301,6 +1334,8 @@@ description: Skyworks Solutions, Inc. "^smartlabs,.*": description: SmartLabs LLC + "^smartrg,.*": + description: SmartRG, Inc. "^smi,.*": description: Silicon Motion Technology Corporation "^smsc,.*": @@@ -1521,8 -1488,6 +1523,8 @@@ description: Ufi Space Co., Ltd. "^ugoos,.*": description: Ugoos Industrial Co., Ltd. + "^uni-t,.*": + description: Uni-Trend Technology (China) Co., Ltd. "^uniwest,.*": description: United Western Technologies Corp (UniWest) "^upisemi,.*": @@@ -1573,16 -1538,10 +1575,16 @@@ description: VoCore Studio "^voipac,.*": description: Voipac Technologies s.r.o. + "^voltafield,.*": + description: Voltafield Technology Corp. "^vot,.*": description: Vision Optical Technology Co., Ltd. + "^vscom,.*": + description: VS Visions Systems GmbH "^vxt,.*": description: VXT Ltd + "^wacom,.*": + description: Wacom "^wanchanglong,.*": description: Wanchanglong Electronics Technology（SHENZHEN）Co.，Ltd. "^wand,.*": diff --combined MAINTAINERS index 7c121493f43d,13a69b4731c7..fb1fef1aebe0 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -24,7 -24,7 +24,7 @@@ Descriptions of section entries and pre filing info, a direct bug tracker link, or a mailto: URI. C: URI for *chat* protocol, server and channel where developers usually hang out, for example irc://server/channel. - P: Subsystem Profile document for more details submitting + P: *Subsystem Profile* document for more details submitting patches to the given subsystem. This is either an in-tree file, or a URI. See Documentation/maintainer/maintainer-entry-profile.rst for details. @@@ -579,12 -579,6 +579,12 @@@ F: drivers/iio/accel/adxl372. F: drivers/iio/accel/adxl372_i2c.c F: drivers/iio/accel/adxl372_spi.c +AF8133J THREE-AXIS MAGNETOMETER DRIVER +M: Ondřej Jirman +S: Maintained +F: Documentation/devicetree/bindings/iio/magnetometer/voltafield,af8133j.yaml +F: drivers/iio/magnetometer/af8133j.c + AF9013 MEDIA DRIVER L: linux-media@vger.kernel.org S: Orphan @@@ -903,12 -897,6 +903,12 @@@ Q: https://patchwork.kernel.org/project F: drivers/infiniband/hw/efa/ F: include/uapi/rdma/efa-abi.h +AMD ADDRESS TRANSLATION LIBRARY (ATL) +M: Yazen Ghannam +L: linux-edac@vger.kernel.org +S: Supported +F: drivers/ras/amd/atl/* + AMD AXI W1 DRIVER M: Kris Chaplin R: Thomas Delev @@@ -1070,7 -1058,7 +1070,7 @@@ F: include/linux/amd-pstate. F: tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py AMD PTDMA DRIVER -M: Sanjay R Mehta +M: Basavaraj Natikar L: dmaengine@vger.kernel.org S: Maintained F: drivers/dma/ptdma/ @@@ -1110,14 -1098,6 +1110,14 @@@ F: Documentation/devicetree/bindings/pe F: drivers/perf/amlogic/ F: include/soc/amlogic/ +AMPHENOL CHIPCAP 2 HUMIDITY-TEMPERATURE IIO DRIVER +M: Javier Carrasco +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/hwmon/amphenol,chipcap2.yaml +F: Documentation/hwmon/chipcap2.rst +F: drivers/hwmon/chipcap2.c + AMPHION VPU CODEC V4L2 DRIVER M: Ming Qian M: Zhou Peng @@@ -1164,7 -1144,7 +1164,7 @@@ L: linux-iio@vger.kernel.or S: Supported W: http://ez.analog.com/community/linux-device-drivers F: Documentation/devicetree/bindings/iio/adc/adi,ad7091r* -F: drivers/iio/adc/drivers/iio/adc/ad7091r* +F: drivers/iio/adc/ad7091r* ANALOG DEVICES INC AD7192 DRIVER M: Alexandru Tachici @@@ -1287,14 -1267,6 +1287,14 @@@ W: https://ez.analog.com/linux-software F: Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml F: drivers/hwmon/adm1177.c +ANALOG DEVICES INC ADMFM2000 DRIVER +M: Kim Seer Paller +L: linux-iio@vger.kernel.org +S: Supported +W: https://ez.analog.com/linux-software-drivers +F: Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml +F: drivers/iio/frequency/admfm2000.c + ANALOG DEVICES INC ADMV1013 DRIVER M: Antoniu Miclaus L: linux-iio@vger.kernel.org @@@ -1412,9 -1384,17 +1412,9 @@@ F: drivers/iio/amplifiers/hmc425a. F: drivers/staging/iio/*/ad* X: drivers/iio/*/adjd* -ANALOG DEVICES INC MAX31760 DRIVER -M: Ibrahim Tilki -S: Maintained -W: http://wiki.analog.com/ -W: https://ez.analog.com/linux-software-drivers -F: Documentation/devicetree/bindings/hwmon/adi,max31760.yaml -F: Documentation/hwmon/max31760.rst -F: drivers/hwmon/max31760.c - ANALOGBITS PLL LIBRARIES M: Paul Walmsley +M: Samuel Holland S: Supported F: drivers/clk/analogbits/* F: include/linux/clk/analogbits* @@@ -1671,7 -1651,7 +1671,7 @@@ F: drivers/soc/versatile ARM KOMEDA DRM-KMS DRIVER M: Liviu Dudau S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/arm,komeda.yaml F: Documentation/gpu/komeda-kms.rst F: drivers/gpu/drm/arm/display/include/ @@@ -1683,15 -1663,26 +1683,26 @@@ M: Rob Herring L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/gpu/panfrost.rst F: drivers/gpu/drm/panfrost/ F: include/uapi/drm/panfrost_drm.h + ARM MALI PANTHOR DRM DRIVER + M: Boris Brezillon + M: Steven Price + M: Liviu Dudau + L: dri-devel@lists.freedesktop.org + S: Supported + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git + F: Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml + F: drivers/gpu/drm/panthor/ + F: include/uapi/drm/panthor_drm.h + ARM MALI-DP DRM DRIVER M: Liviu Dudau S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/arm,malidp.yaml F: Documentation/gpu/afbc.rst F: drivers/gpu/drm/arm/ @@@ -2176,7 -2167,7 +2187,7 @@@ M: Shawn Guo R: Pengutronix Kernel Team R: Fabio Estevam -R: NXP Linux Team +L: imx@lists.linux.dev L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git @@@ -2377,8 -2368,8 +2388,8 @@@ M: Sean Wang -R: Andreas Färber +R: Chester Lin R: Matthias Brugger -R: NXP S32 Linux Team +R: Ghennadi Procopciuc +L: NXP S32 Linux Team L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm64/boot/dts/freescale/s32g*.dts* +F: drivers/pinctrl/nxp/ ARM/Orion SoC/Technologic Systems TS-78xx platform support M: Alexander Clouter @@@ -2617,7 -2605,6 +2628,7 @@@ F: drivers/pci/controller/dwc/pcie-qcom F: drivers/phy/qualcomm/ F: drivers/power/*/msm* F: drivers/reset/reset-qcom-* +F: drivers/rtc/rtc-pm8xxx.c F: drivers/spi/spi-geni-qcom.c F: drivers/spi/spi-qcom-qspi.c F: drivers/spi/spi-qup.c @@@ -2776,7 -2763,6 +2787,7 @@@ M: Andrzej Hajda +L: linux-hwmon@vger.kernel.org +S: Maintained +F: drivers/hwmon/asus_rog_ryujin.c + ASUS WIRELESS RADIO CONTROL DRIVER M: João Paulo Rechi Vita L: platform-driver-x86@vger.kernel.org @@@ -3407,15 -3387,11 +3418,15 @@@ F: drivers/base/auxiliary. F: include/linux/auxiliary_bus.h AUXILIARY DISPLAY DRIVERS -M: Miguel Ojeda -S: Maintained +M: Andy Shevchenko +R: Geert Uytterhoeven +S: Odd Fixes +T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git F: Documentation/devicetree/bindings/auxdisplay/ F: drivers/auxdisplay/ F: include/linux/cfag12864b.h +F: include/uapi/linux/map_to_14segment.h +F: include/uapi/linux/map_to_7segment.h AVIA HX711 ANALOG DIGITAL CONVERTER IIO DRIVER M: Andreas Klinger @@@ -3571,7 -3547,6 +3582,7 @@@ R: Brian Foster -R: Andy Shevchenko R: Rasmus Villemoes S: Maintained F: include/linux/bitfield.h @@@ -3834,7 -3810,6 +3845,7 @@@ M: Alexei Starovoitov M: Andrii Nakryiko R: Martin KaFai Lau +R: Eduard Zingerman R: Song Liu R: Yonghong Song R: John Fastabend @@@ -3895,7 -3870,6 +3906,7 @@@ F: net/unix/unix_bpf. BPF [LIBRARY] (libbpf) M: Andrii Nakryiko +M: Eduard Zingerman L: bpf@vger.kernel.org S: Maintained F: tools/lib/bpf/ @@@ -3942,7 -3916,8 +3953,7 @@@ F: kernel/bpf/ringbuf. BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF) M: KP Singh -R: Florent Revest -R: Brendan Jackman +R: Matt Bobrowski L: bpf@vger.kernel.org S: Maintained F: Documentation/bpf/prog_lsm.rst @@@ -3952,7 -3927,6 +3963,7 @@@ F: security/bpf BPF [SELFTESTS] (Test Runners & Infrastructure) M: Andrii Nakryiko +M: Eduard Zingerman R: Mykola Lysenko L: bpf@vger.kernel.org S: Maintained @@@ -3967,7 -3941,7 +3978,7 @@@ F: kernel/bpf/bpf_lru F: kernel/bpf/cgroup.c BPF [TOOLING] (bpftool) -M: Quentin Monnet +M: Quentin Monnet L: bpf@vger.kernel.org S: Maintained F: kernel/bpf/disasm.* @@@ -4666,8 -4640,8 +4677,8 @@@ S: Maintaine F: net/sched/sch_cake.c CAN NETWORK DRIVERS -M: Wolfgang Grandegger M: Marc Kleine-Budde +M: Vincent Mailhol L: linux-can@vger.kernel.org S: Maintained W: https://github.com/linux-can @@@ -5027,12 -5001,6 +5038,12 @@@ R: Sami Kyöstilä +L: chrome-platform@lists.linux.dev +S: Maintained +F: drivers/watchdog/cros_ec_wdt.c + CHRONTEL CH7322 CEC DRIVER M: Joe Tessler L: linux-media@vger.kernel.org @@@ -5057,7 -5025,6 +5068,7 @@@ F: include/linux/mfd/cs42l43 F: include/sound/cs* F: sound/pci/hda/cirrus* F: sound/pci/hda/cs* +F: sound/pci/hda/hda_component* F: sound/pci/hda/hda_cs_dsp_ctl.* F: sound/soc/codecs/cs* @@@ -5283,7 -5250,6 +5294,7 @@@ R: Paulo Alcantara ( R: Ronnie Sahlberg (directory leases, sparse files) R: Shyam Prasad N (multichannel) R: Tom Talpey (RDMA, smbdirect) +R: Bharath SM (deferred close, directory leases) L: linux-cifs@vger.kernel.org L: samba-technical@lists.samba.org (moderated for non-subscribers) S: Supported @@@ -5334,7 -5300,6 +5345,7 @@@ M: Dan Williams M: Mike Snitzer M: Mikulas Patocka -M: dm-devel@lists.linux.dev L: dm-devel@lists.linux.dev S: Maintained Q: http://patchwork.kernel.org/project/dm-devel/list/ @@@ -6169,13 -6134,6 +6180,13 @@@ F: include/linux/device-mapper. F: include/linux/dm-*.h F: include/uapi/linux/dm-*.h +DEVICE-MAPPER VDO TARGET +M: Matthew Sakai +L: dm-devel@lists.linux.dev +S: Maintained +F: Documentation/admin-guide/device-mapper/vdo*.rst +F: drivers/md/dm-vdo/ + DEVLINK M: Jiri Pirko L: netdev@vger.kernel.org @@@ -6203,16 -6161,16 +6214,16 @@@ DIALOG SEMICONDUCTOR DRIVER M: Support Opensource S: Supported W: http://www.dialog-semiconductor.com/products -F: Documentation/devicetree/bindings/input/da90??-onkey.txt F: Documentation/devicetree/bindings/input/dlg,da72??.txt +F: Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml F: Documentation/devicetree/bindings/mfd/da90*.txt F: Documentation/devicetree/bindings/mfd/dlg,da90*.yaml F: Documentation/devicetree/bindings/regulator/da92*.txt F: Documentation/devicetree/bindings/regulator/dlg,da9*.yaml F: Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml F: Documentation/devicetree/bindings/sound/da[79]*.txt -F: Documentation/devicetree/bindings/thermal/da90??-thermal.txt -F: Documentation/devicetree/bindings/watchdog/dlg,da90??-watchdog.yaml +F: Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml +F: Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml F: Documentation/hwmon/da90??.rst F: drivers/gpio/gpio-da90??.c F: drivers/hwmon/da90??-hwmon.c @@@ -6312,7 -6270,7 +6323,7 @@@ L: linux-media@vger.kernel.or L: dri-devel@lists.freedesktop.org L: linaro-mm-sig@lists.linaro.org (moderated for non-subscribers) S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/driver-api/dma-buf.rst F: Documentation/userspace-api/dma-buf-alloc-exchange.rst F: drivers/dma-buf/ @@@ -6366,7 -6324,7 +6377,7 @@@ L: linux-media@vger.kernel.or L: dri-devel@lists.freedesktop.org L: linaro-mm-sig@lists.linaro.org (moderated for non-subscribers) S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/dma-buf/dma-heap.c F: drivers/dma-buf/heaps/* F: include/linux/dma-heap.h @@@ -6430,7 -6388,6 +6441,7 @@@ L: linux-doc@vger.kernel.or S: Maintained F: Documentation/admin-guide/quickly-build-trimmed-linux.rst F: Documentation/admin-guide/reporting-issues.rst +F: Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst DOCUMENTATION SCRIPTS M: Mauro Carvalho Chehab @@@ -6575,7 -6532,7 +6586,7 @@@ M: Jacek Lawrynowicz L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/accel/ivpu/ F: include/uapi/drm/ivpu_accel.h @@@ -6595,18 -6552,18 +6606,18 @@@ M: Chen-Yu Tsai L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/sun4i/sun8i* DRM DRIVER FOR ARM PL111 CLCD S: Orphan - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/pl111/ DRM DRIVER FOR ARM VERSATILE TFT PANELS M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml F: drivers/gpu/drm/panel/panel-arm-versatile.c @@@ -6614,7 -6571,7 +6625,7 @@@ DRM DRIVER FOR ASPEED BMC GF M: Joel Stanley L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers) S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/gpu/aspeed-gfx.txt F: drivers/gpu/drm/aspeed/ @@@ -6624,14 -6581,14 +6635,14 @@@ R: Thomas Zimmermann L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/ast/ DRM DRIVER FOR BOCHS VIRTUAL GPU M: Gerd Hoffmann L: virtualization@lists.linux.dev S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/tiny/bochs.c DRM DRIVER FOR BOE HIMAX8279D PANELS @@@ -6649,14 -6606,14 +6660,14 @@@ F: drivers/gpu/drm/bridge/chipone-icn62 DRM DRIVER FOR EBBG FT8719 PANEL M: Joel Selvaraj S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/ebbg,ft8719.yaml F: drivers/gpu/drm/panel/panel-ebbg-ft8719.c DRM DRIVER FOR FARADAY TVE200 TV ENCODER M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/tve200/ DRM DRIVER FOR FEIXIN K101 IM2BA02 MIPI-DSI LCD PANELS @@@ -6676,7 -6633,7 +6687,7 @@@ M: Thomas Zimmermann L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/drm_aperture.c F: drivers/gpu/drm/tiny/ofdrm.c F: drivers/gpu/drm/tiny/simpledrm.c @@@ -6695,27 -6652,27 +6706,27 @@@ DRM DRIVER FOR GENERIC USB DISPLA M: Noralf Trønnes S: Maintained W: https://github.com/notro/gud/wiki - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/gud/ F: include/drm/gud.h DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS M: Hans de Goede S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/tiny/gm12u320.c DRM DRIVER FOR HIMAX HX8394 MIPI-DSI LCD panels M: Ondrej Jirman M: Javier Martinez Canillas S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml F: drivers/gpu/drm/panel/panel-himax-hx8394.c DRM DRIVER FOR HX8357D PANELS S: Orphan - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/himax,hx8357d.txt F: drivers/gpu/drm/tiny/hx8357d.c @@@ -6724,20 -6681,20 +6735,20 @@@ M: Deepak Rawat S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/ilitek,ili9225.txt F: drivers/gpu/drm/tiny/ili9225.c DRM DRIVER FOR ILITEK ILI9486 PANELS M: Kamlesh Gurudasani S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/ilitek,ili9486.yaml F: drivers/gpu/drm/tiny/ili9486.c @@@ -6756,14 -6713,14 +6767,14 @@@ F: drivers/gpu/drm/panel/panel-jadard-j DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER M: Paul Kocialkowski S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/logicvc/ DRM DRIVER FOR LVDS PANELS M: Laurent Pinchart L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/lvds.yaml F: Documentation/devicetree/bindings/display/panel/panel-lvds.yaml F: drivers/gpu/drm/panel/panel-lvds.c @@@ -6781,13 -6738,13 +6792,13 @@@ R: Thomas Zimmermann L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/mgag200/ DRM DRIVER FOR MI0283QT M: Noralf Trønnes S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt F: drivers/gpu/drm/tiny/mi0283qt.c @@@ -6795,7 -6752,7 +6806,7 @@@ DRM DRIVER FOR MIPI DBI compatible pane M: Noralf Trønnes S: Maintained W: https://github.com/notro/panel-mipi-dbi/wiki - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml F: drivers/gpu/drm/tiny/panel-mipi-dbi.c @@@ -6819,28 -6776,28 +6830,28 @@@ F: include/uapi/drm/msm_drm. DRM DRIVER FOR NOVATEK NT35510 PANELS M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml F: drivers/gpu/drm/panel/panel-novatek-nt35510.c DRM DRIVER FOR NOVATEK NT35560 PANELS M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml F: drivers/gpu/drm/panel/panel-novatek-nt35560.c DRM DRIVER FOR NOVATEK NT36523 PANELS M: Jianhua Lu S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml F: drivers/gpu/drm/panel/panel-novatek-nt36523.c DRM DRIVER FOR NOVATEK NT36672A PANELS M: Sumit Semwal S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml F: drivers/gpu/drm/panel/panel-novatek-nt36672a.c @@@ -6874,7 -6831,7 +6885,7 @@@ F: drivers/gpu/drm/bridge/parade-ps8640 DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS M: Noralf Trønnes S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/repaper.txt F: drivers/gpu/drm/tiny/repaper.c @@@ -6884,7 -6841,7 +6895,7 @@@ M: Gerd Hoffmann S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml F: drivers/gpu/drm/panel/panel-samsung-db7430.c @@@ -6915,7 -6872,7 +6926,7 @@@ M: Inki Dae M: Marek Szyprowski S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml F: drivers/gpu/drm/bridge/samsung-dsim.c F: include/drm/bridge/samsung-dsim.h @@@ -6935,7 -6892,7 +6946,7 @@@ F: drivers/gpu/drm/panel/panel-samsung- DRM DRIVER FOR SITRONIX ST7586 PANELS M: David Lechner S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/sitronix,st7586.txt F: drivers/gpu/drm/tiny/st7586.c @@@ -6956,14 -6913,14 +6967,14 @@@ F: drivers/gpu/drm/panel/panel-sitronix DRM DRIVER FOR SITRONIX ST7735R PANELS M: David Lechner S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/sitronix,st7735r.yaml F: drivers/gpu/drm/tiny/st7735r.c DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS M: Javier Martinez Canillas S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/solomon,ssd-common.yaml F: Documentation/devicetree/bindings/display/solomon,ssd13*.yaml F: drivers/gpu/drm/solomon/ssd130x* @@@ -6971,7 -6928,7 +6982,7 @@@ DRM DRIVER FOR ST-ERICSSON MCDE M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/ste,mcde.yaml F: drivers/gpu/drm/mcde/ @@@ -6995,7 -6952,7 +7006,7 @@@ F: drivers/gpu/drm/bridge/ti-sn65dsi86. DRM DRIVER FOR TPO TPG110 PANELS M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/tpo,tpg110.yaml F: drivers/gpu/drm/panel/panel-tpo-tpg110.c @@@ -7005,7 -6962,7 +7016,7 @@@ R: Sean Paul L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/udl/ DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS) @@@ -7016,7 -6973,7 +7027,7 @@@ R: Haneen Mohammed L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/gpu/vkms.rst F: drivers/gpu/drm/vkms/ @@@ -7024,7 -6981,7 +7035,7 @@@ DRM DRIVER FOR VIRTUALBOX VIRTUAL GP M: Hans de Goede L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/vboxvideo/ DRM DRIVER FOR VMWARE VIRTUAL GPU @@@ -7032,14 -6989,14 +7043,14 @@@ M: Zack Rusin L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/vmwgfx/ F: include/uapi/drm/vmwgfx_drm.h DRM DRIVER FOR WIDECHIPS WS2401 PANELS M: Linus Walleij S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml F: drivers/gpu/drm/panel/panel-widechips-ws2401.c @@@ -7064,8 -7021,8 +7075,8 @@@ M: Maarten Lankhorst M: Thomas Zimmermann S: Maintained - W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html - T: git git://anongit.freedesktop.org/drm/drm-misc + W: https://drm.pages.freedesktop.org/maintainer-tools/drm-misc.html + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/ F: Documentation/devicetree/bindings/gpu/ F: Documentation/gpu/ @@@ -7092,7 -7049,7 +7103,7 @@@ M: Maxime Ripard L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/allwinner* F: drivers/gpu/drm/sun4i/ @@@ -7102,7 -7059,7 +7113,7 @@@ L: dri-devel@lists.freedesktop.or L: linux-amlogic@lists.infradead.org S: Supported W: http://linux-meson.com/ - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml F: Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml F: Documentation/gpu/meson.rst @@@ -7114,7 -7071,7 +7125,7 @@@ M: Sam Ravnborg L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/atmel/ F: drivers/gpu/drm/atmel-hlcdc/ @@@ -7126,7 -7083,7 +7137,7 @@@ R: Laurent Pinchart R: Jernej Skrabec S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/bridge/ F: drivers/gpu/drm/bridge/ F: drivers/gpu/drm/drm_bridge.c @@@ -7151,7 -7108,7 +7162,7 @@@ M: Stefan Agner L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/fsl,dcu.txt F: Documentation/devicetree/bindings/display/fsl,tcon.txt F: drivers/gpu/drm/fsl-dcu/ @@@ -7160,7 -7117,7 +7171,7 @@@ DRM DRIVERS FOR FREESCALE IMX 5/ M: Philipp Zabel L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git T: git git://git.pengutronix.de/git/pza/linux F: Documentation/devicetree/bindings/display/imx/ F: drivers/gpu/drm/imx/ipuv3/ @@@ -7180,7 -7137,7 +7191,7 @@@ DRM DRIVERS FOR GMA500 (Poulsbo, Moores M: Patrik Jakobsson L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/gma500/ DRM DRIVERS FOR HISILICON @@@ -7192,7 -7149,7 +7203,7 @@@ R: Yongqin Liu L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/hisilicon/ F: drivers/gpu/drm/hisilicon/ @@@ -7201,7 -7158,7 +7212,7 @@@ M: Qiang Yu L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/loongson/ DRM DRIVERS FOR MEDIATEK @@@ -7257,7 -7214,7 +7268,7 @@@ M: Biju Das L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/rockchip/ F: drivers/gpu/drm/ci/xfails/rockchip* F: drivers/gpu/drm/rockchip/ @@@ -7287,7 -7244,7 +7298,7 @@@ DRM DRIVERS FOR ST M: Alain Volmat L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/st,stih4xx.txt F: drivers/gpu/drm/sti @@@ -7297,7 -7254,7 +7308,7 @@@ M: Raphael Gallais-Pou L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/st,stm32-ltdc.yaml F: drivers/gpu/drm/stm @@@ -7306,7 -7263,7 +7317,7 @@@ M: Jyri Sarha L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml F: Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml F: Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml @@@ -7317,7 -7274,7 +7328,7 @@@ M: Jyri Sarha L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/tilcdc/ F: drivers/gpu/drm/tilcdc/ @@@ -7325,7 -7282,7 +7336,7 @@@ DRM DRIVERS FOR TI OMA M: Tomi Valkeinen L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/ti/ F: drivers/gpu/drm/omapdrm/ @@@ -7333,7 -7290,7 +7344,7 @@@ DRM DRIVERS FOR V3 M: Melissa Wen M: Maíra Canal S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml F: drivers/gpu/drm/v3d/ F: include/uapi/drm/v3d_drm.h @@@ -7342,7 -7299,7 +7353,7 @@@ DRM DRIVERS FOR VC M: Maxime Ripard S: Supported T: git git://github.com/anholt/linux - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/brcm,bcm2835-*.yaml F: drivers/gpu/drm/vc4/ F: include/uapi/drm/vc4_drm.h @@@ -7363,7 -7320,7 +7374,7 @@@ M: Oleksandr Andrushchenko L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/xlnx/ F: drivers/gpu/drm/xlnx/ @@@ -7380,7 -7337,7 +7391,7 @@@ M: Luben Tuikov L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/scheduler/ F: include/drm/gpu_scheduler.h @@@ -7390,7 -7347,7 +7401,7 @@@ R: Jessica Zhang L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/panel/ F: drivers/gpu/drm/drm_panel.c F: drivers/gpu/drm/panel/ @@@ -7400,7 -7357,7 +7411,7 @@@ DRM PRIVACY-SCREEN CLAS M: Hans de Goede L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/drm_privacy_screen* F: include/drm/drm_privacy_screen* @@@ -7409,7 -7366,7 +7420,7 @@@ M: Christian Koenig L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/ttm/ F: include/drm/ttm/ @@@ -7417,7 -7374,7 +7428,7 @@@ DRM AUTOMATED TESTIN M: Helen Koike L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/gpu/automated_testing.rst F: drivers/gpu/drm/ci/ @@@ -7647,6 -7604,7 +7658,6 @@@ R: Robert Richter -M: Ritesh Harjani -M: Asutosh Das +M: Asutosh Das +R: Ritesh Harjani L: linux-mmc@vger.kernel.org S: Supported F: drivers/mmc/host/cqhci* @@@ -7938,7 -7896,6 +7949,7 @@@ M: Gao Xiang R: Yue Hu R: Jeffle Xu +R: Sandeep Dhavale L: linux-erofs@lists.ozlabs.org S: Maintained W: https://erofs.docs.kernel.org @@@ -7954,13 -7911,6 +7965,13 @@@ S: Maintaine F: include/linux/errseq.h F: lib/errseq.c +ESD CAN NETWORK DRIVERS +M: Stefan Mätje +R: socketcan@esd.eu +L: linux-can@vger.kernel.org +S: Maintained +F: drivers/net/can/esd/ + ESD CAN/USB DRIVERS M: Frank Jungclaus R: socketcan@esd.eu @@@ -8056,19 -8006,11 +8067,19 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git F: fs/exfat/ +EXPRESSWIRE PROTOCOL LIBRARY +M: Duje Mihanović +L: linux-leds@vger.kernel.org +S: Maintained +F: drivers/leds/leds-expresswire.c +F: include/linux/leds-expresswire.h + EXT2 FILE SYSTEM M: Jan Kara L: linux-ext4@vger.kernel.org S: Maintained F: Documentation/filesystems/ext2.rst +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git F: fs/ext2/ F: include/linux/ext2* @@@ -8245,7 -8187,6 +8256,7 @@@ F: include/uapi/scsi/fc FILE LOCKING (flock() and fcntl()/lockf()) M: Jeff Layton M: Chuck Lever +R: Alexander Aring L: linux-fsdevel@vger.kernel.org S: Maintained F: fs/fcntl.c @@@ -8483,7 -8424,7 +8494,7 @@@ F: arch/x86/math-emu FRAMEBUFFER CORE M: Daniel Vetter S: Odd Fixes - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/video/fbdev/core/ FRAMEBUFFER LAYER @@@ -8576,7 -8517,7 +8587,7 @@@ FREESCALE IMX / MXC FEC DRIVE M: Wei Fang R: Shenwei Wang R: Clark Wang -R: NXP Linux Team +L: imx@lists.linux.dev L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/fsl,fec.yaml @@@ -8611,7 -8552,7 +8622,7 @@@ F: drivers/i2c/busses/i2c-imx. FREESCALE IMX LPI2C DRIVER M: Dong Aisheng L: linux-i2c@vger.kernel.org -L: linux-imx@nxp.com +L: imx@lists.linux.dev S: Maintained F: Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml F: drivers/i2c/busses/i2c-imx-lpi2c.c @@@ -8671,13 -8612,6 +8682,13 @@@ F: Documentation/devicetree/bindings/so F: drivers/soc/fsl/qe/qmc.c F: include/soc/fsl/qe/qmc.h +FREESCALE QUICC ENGINE QMC HDLC DRIVER +M: Herve Codina +L: netdev@vger.kernel.org +L: linuxppc-dev@lists.ozlabs.org +S: Maintained +F: drivers/net/wan/fsl_qmc_hdlc.c + FREESCALE QUICC ENGINE TSA DRIVER M: Herve Codina L: linuxppc-dev@lists.ozlabs.org @@@ -8999,11 -8933,6 +9010,11 @@@ F: Documentation/i2c/muxes/i2c-mux-gpio F: drivers/i2c/muxes/i2c-mux-gpio.c F: include/linux/platform_data/i2c-mux-gpio.h +GENERIC GPIO RESET DRIVER +M: Krzysztof Kozlowski +S: Maintained +F: drivers/reset/reset-gpio.c + GENERIC HDLC (WAN) DRIVERS M: Krzysztof Halasa S: Maintained @@@ -9074,10 -9003,9 +9085,10 @@@ F: include/linux/string. F: include/linux/string_choices.h F: include/linux/string_helpers.h F: lib/string.c +F: lib/string_kunit.c F: lib/string_helpers.c -F: lib/test-string_helpers.c -F: lib/test_string.c +F: lib/string_helpers_kunit.c +F: scripts/coccinelle/api/string_choices.cocci GENERIC UIO DRIVER FOR PCI DEVICES M: "Michael S. Tsirkin" @@@ -9179,7 -9107,6 +9190,7 @@@ F: Documentation/devicetree/bindings/cl F: arch/arm64/boot/dts/exynos/google/ F: drivers/clk/samsung/clk-gs101.c F: include/dt-bindings/clock/google,gs101.h +K: [gG]oogle.?[tT]ensor GPD POCKET FAN DRIVER M: Hans de Goede @@@ -9249,7 -9176,6 +9260,7 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git F: Documentation/ABI/obsolete/sysfs-gpio F: Documentation/ABI/testing/gpio-cdev +F: Documentation/userspace-api/gpio/ F: drivers/gpio/gpiolib-cdev.c F: include/uapi/linux/gpio.h F: tools/gpio/ @@@ -9522,7 -9448,7 +9533,7 @@@ T: git git://linuxtv.org/media_tree.gi F: drivers/media/usb/hdpvr/ HEWLETT PACKARD ENTERPRISE ILO CHIF DRIVER -M: Matt Hsiao +M: Keng-Yu Lin S: Supported F: drivers/misc/hpilo.[ch] @@@ -9651,9 -9577,7 +9662,9 @@@ L: linux-input@vger.kernel.or S: Maintained F: drivers/hid/hid-logitech-hidpp.c -HIGH-RESOLUTION TIMERS, CLOCKEVENTS +HIGH-RESOLUTION TIMERS, TIMER WHEEL, CLOCKEVENTS +M: Anna-Maria Behnsen +M: Frederic Weisbecker M: Thomas Gleixner L: linux-kernel@vger.kernel.org S: Maintained @@@ -9661,13 -9585,9 +9672,13 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/timers/ F: include/linux/clockchips.h F: include/linux/hrtimer.h +F: include/linux/timer.h F: kernel/time/clockevents.c F: kernel/time/hrtimer.c -F: kernel/time/timer_*.c +F: kernel/time/timer.c +F: kernel/time/timer_list.c +F: kernel/time/timer_migration.* +F: tools/testing/selftests/timers/ HIGH-SPEED SCC DRIVER FOR AX.25 L: linux-hams@vger.kernel.org @@@ -9898,11 -9818,10 +9909,11 @@@ F: drivers/iio/pressure/hsc030pa HONEYWELL MPRLS0025PA PRESSURE SENSOR SERIES IIO DRIVER M: Andreas Klinger +M: Petre Rodan L: linux-iio@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/iio/pressure/honeywell,mprls0025pa.yaml -F: drivers/iio/pressure/mprls0025pa.c +F: drivers/iio/pressure/mprls0025pa* HP BIOSCFG DRIVER M: Jorge Lopez @@@ -10183,6 -10102,7 +10194,6 @@@ S: Maintaine W: https://i2c.wiki.kernel.org/ Q: https://patchwork.ozlabs.org/project/linux-i2c/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git -F: Documentation/devicetree/bindings/i2c/i2c.txt F: Documentation/i2c/ F: drivers/i2c/* F: include/dt-bindings/i2c/i2c.h @@@ -10402,17 -10322,12 +10413,17 @@@ M: Nayna Jain L: linux-crypto@vger.kernel.org S: Supported -F: drivers/crypto/vmx/Kconfig -F: drivers/crypto/vmx/Makefile -F: drivers/crypto/vmx/aes* -F: drivers/crypto/vmx/ghash* -F: drivers/crypto/vmx/ppc-xlate.pl -F: drivers/crypto/vmx/vmx.c +F: arch/powerpc/crypto/Kconfig +F: arch/powerpc/crypto/Makefile +F: arch/powerpc/crypto/aes.c +F: arch/powerpc/crypto/aes_cbc.c +F: arch/powerpc/crypto/aes_ctr.c +F: arch/powerpc/crypto/aes_xts.c +F: arch/powerpc/crypto/aesp8-ppc.* +F: arch/powerpc/crypto/ghash.c +F: arch/powerpc/crypto/ghashp8-ppc.pl +F: arch/powerpc/crypto/ppc-xlate.pl +F: arch/powerpc/crypto/vmx.c IBM ServeRAID RAID DRIVER S: Orphan @@@ -10495,14 -10410,6 +10506,14 @@@ L: linux-media@vger.kernel.or S: Maintained F: drivers/media/rc/iguanair.c +IIO BACKEND FRAMEWORK +M: Nuno Sa +R: Olivier Moysan +L: linux-iio@vger.kernel.org +S: Maintained +F: drivers/iio/industrialio-backend.c +F: include/linux/iio/backend.h + IIO DIGITAL POTENTIOMETER DAC M: Peter Rosin L: linux-iio@vger.kernel.org @@@ -10525,7 -10432,6 +10536,7 @@@ L: linux-iio@vger.kernel.or S: Maintained F: drivers/iio/industrialio-gts-helper.c F: include/linux/iio/iio-gts-helper.h +F: drivers/iio/test/iio-test-gts.c IIO MULTIPLEXER M: Peter Rosin @@@ -10590,9 -10496,8 +10601,9 @@@ IMGTEC POWERVR DRM DRIVE M: Frank Binns M: Matt Coster S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git -F: Documentation/devicetree/bindings/gpu/img,powervr.yaml +F: Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml +F: Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml F: Documentation/gpu/imagination/ F: drivers/gpu/drm/imagination/ F: include/uapi/drm/pvr_drm.h @@@ -10609,6 -10514,22 +10620,6 @@@ L: linux-fbdev@vger.kernel.or S: Orphan F: drivers/video/fbdev/imsttfb.c -INA209 HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/hwmon/ti,ina2xx.yaml -F: Documentation/hwmon/ina209.rst -F: drivers/hwmon/ina209.c - -INA2XX HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/hwmon/ina2xx.rst -F: drivers/hwmon/ina2xx.c -F: include/linux/platform_data/ina2xx.h - INDEX OF FURTHER KERNEL DOCUMENTATION M: Carlos Bilbao S: Maintained @@@ -10834,7 -10755,7 +10845,7 @@@ INTEL DRM I915 DRIVER (Meteor Lake, DG M: Jani Nikula M: Joonas Lahtinen M: Rodrigo Vivi -M: Tvrtko Ursulin +M: Tvrtko Ursulin L: intel-gfx@lists.freedesktop.org S: Supported W: https://drm.pages.freedesktop.org/intel-docs/ @@@ -11256,16 -11177,6 +11267,16 @@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/wwan/iosm/ +INTEL(R) FLEXIBLE RETURN AND EVENT DELIVERY +M: Xin Li +M: "H. Peter Anvin" +S: Supported +F: Documentation/arch/x86/x86_64/fred.rst +F: arch/x86/entry/entry_64_fred.S +F: arch/x86/entry/entry_fred.c +F: arch/x86/include/asm/fred.h +F: arch/x86/kernel/fred.c + INTEL(R) TRACE HUB M: Alexander Shishkin S: Supported @@@ -11354,6 -11265,7 +11365,6 @@@ F: drivers/iommu F: include/linux/iommu.h F: include/linux/iova.h F: include/linux/of_iommu.h -F: include/uapi/linux/iommu.h IOMMUFD M: Jason Gunthorpe @@@ -11371,7 -11283,7 +11382,7 @@@ IOSYS-MAP HELPER M: Thomas Zimmermann L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: include/linux/iosys-map.h IO_URING @@@ -11564,7 -11476,7 +11575,7 @@@ ITE IT66121 HDMI BRIDGE DRIVE M: Phong LE M: Neil Armstrong S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml F: drivers/gpu/drm/bridge/ite-it66121.c @@@ -11593,6 -11505,14 +11604,6 @@@ S: Maintaine F: arch/x86/include/asm/jailhouse_para.h F: arch/x86/kernel/jailhouse.c -JC42.4 TEMPERATURE SENSOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/hwmon/jedec,jc42.yaml -F: Documentation/hwmon/jc42.rst -F: drivers/hwmon/jc42.c - JFS FILESYSTEM M: Dave Kleikamp L: jfs-discussion@lists.sourceforge.net @@@ -12152,12 -12072,6 +12163,12 @@@ S: Maintaine F: Documentation/devicetree/bindings/leds/backlight/kinetic,ktd253.yaml F: drivers/video/backlight/ktd253-backlight.c +KTD2801 BACKLIGHT DRIVER +M: Duje Mihanović +S: Maintained +F: Documentation/devicetree/bindings/leds/backlight/kinetic,ktd2801.yaml +F: drivers/video/backlight/ktd2801-backlight.c + KTEST M: Steven Rostedt M: John Hawley @@@ -12265,11 -12179,11 +12276,11 @@@ F: Documentation/scsi/53c700.rs F: drivers/scsi/53c700* LEAKING_ADDRESSES -M: Tobin C. Harding M: Tycho Andersen +R: Kees Cook L: linux-hardening@vger.kernel.org S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening F: scripts/leaking_addresses.pl LED SUBSYSTEM @@@ -12495,6 -12409,7 +12506,6 @@@ F: drivers/*/*/*pasemi F: drivers/*/*pasemi* F: drivers/char/tpm/tpm_ibmvtpm* F: drivers/crypto/nx/ -F: drivers/crypto/vmx/ F: drivers/i2c/busses/i2c-opal.c F: drivers/net/ethernet/ibm/ibmveth.* F: drivers/net/ethernet/ibm/ibmvnic.* @@@ -12622,6 -12537,7 +12633,6 @@@ F: arch/powerpc/include/asm/livepatch. F: include/linux/livepatch.h F: kernel/livepatch/ F: kernel/module/livepatch.c -F: lib/livepatch/ F: samples/livepatch/ F: tools/testing/selftests/livepatch/ @@@ -12662,6 -12578,13 +12673,6 @@@ F: Documentation/hwmon/lm90.rs F: drivers/hwmon/lm90.c F: include/dt-bindings/thermal/lm90.h -LM95234 HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/hwmon/lm95234.rst -F: drivers/hwmon/lm95234.c - LME2510 MEDIA DRIVER M: Malcolm Priestley L: linux-media@vger.kernel.org @@@ -12865,13 -12788,12 +12876,13 @@@ W: https://ez.analog.com/linux-software F: Documentation/devicetree/bindings/iio/temperature/adi,ltc2983.yaml F: drivers/iio/temperature/ltc2983.c -LTC4261 HARDWARE MONITOR DRIVER -M: Guenter Roeck +LTC4282 HARDWARE MONITOR DRIVER +M: Nuno Sa L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/hwmon/ltc4261.rst -F: drivers/hwmon/ltc4261.c +S: Supported +F: Documentation/devicetree/bindings/hwmon/adi,ltc4282.yaml +F: Documentation/hwmon/ltc4282.rst +F: drivers/hwmon/ltc4282.c LTC4286 HARDWARE MONITOR DRIVER M: Delphine CC Chiu @@@ -13138,7 -13060,6 +13149,7 @@@ F: drivers/net/ethernet/marvell/mvpp2 MARVELL MWIFIEX WIRELESS DRIVER M: Brian Norris +R: Francesco Dolcini L: linux-wireless@vger.kernel.org S: Odd Fixes F: drivers/net/wireless/marvell/mwifiex/ @@@ -13161,15 -13082,6 +13172,15 @@@ L: netdev@vger.kernel.or S: Supported F: drivers/net/ethernet/marvell/octeon_ep +MARVELL OCTEON ENDPOINT VF DRIVER +M: Veerasenareddy Burru +M: Sathesh Edara +M: Shinas Rasheed +M: Satananda Burla +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/marvell/octeon_ep_vf + MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER M: Sunil Goutham M: Geetha sowjanya @@@ -13230,6 -13142,13 +13241,6 @@@ S: Maintaine F: Documentation/hwmon/max15301.rst F: drivers/hwmon/pmbus/max15301.c -MAX16065 HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/hwmon/max16065.rst -F: drivers/hwmon/max16065.c - MAX2175 SDR TUNER DRIVER M: Ramesh Shanmugasundaram L: linux-media@vger.kernel.org @@@ -13240,6 -13159,15 +13251,6 @@@ F: Documentation/userspace-api/media/dr F: drivers/media/i2c/max2175* F: include/uapi/linux/max2175.h -MAX31827 TEMPERATURE SWITCH DRIVER -M: Daniel Matyas -L: linux-hwmon@vger.kernel.org -S: Supported -W: https://ez.analog.com/linux-software-drivers -F: Documentation/devicetree/bindings/hwmon/adi,max31827.yaml -F: Documentation/hwmon/max31827.rst -F: drivers/hwmon/max31827.c - MAX31335 RTC DRIVER M: Antoniu Miclaus L: linux-rtc@vger.kernel.org @@@ -13254,6 -13182,15 +13265,6 @@@ S: Orpha F: Documentation/hwmon/max6650.rst F: drivers/hwmon/max6650.c -MAX6697 HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/hwmon/max6697.txt -F: Documentation/hwmon/max6697.rst -F: drivers/hwmon/max6697.c -F: include/linux/platform_data/max6697.h - MAX9286 QUAD GMSL DESERIALIZER DRIVER M: Jacopo Mondi M: Kieran Bingham @@@ -13669,7 -13606,6 +13680,7 @@@ T: git git://linuxtv.org/media_tree.gi F: Documentation/devicetree/bindings/media/renesas,csi2.yaml F: Documentation/devicetree/bindings/media/renesas,isp.yaml F: Documentation/devicetree/bindings/media/renesas,vin.yaml +F: drivers/media/platform/renesas/rcar-csi2.c F: drivers/media/platform/renesas/rcar-isp.c F: drivers/media/platform/renesas/rcar-vin/ @@@ -13757,7 -13693,7 +13768,7 @@@ L: dmaengine@vger.kernel.or L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-mediatek@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/dma/mtk-* +F: Documentation/devicetree/bindings/dma/mediatek,* F: drivers/dma/mediatek/ MEDIATEK ETHERNET DRIVER @@@ -13834,13 -13770,6 +13845,13 @@@ F: Documentation/devicetree/bindings/me F: drivers/media/platform/mediatek/vcodec/ F: drivers/media/platform/mediatek/vpu/ +MEDIATEK MIPI-CSI CDPHY DRIVER +M: Julien Stephan +M: Andy Hsieh +S: Supported +F: Documentation/devicetree/bindings/phy/mediatek,mt8365-csi-rx.yaml +F: drivers/phy/mediatek/phy-mtk-mipi-csi-0-5* + MEDIATEK MMC/SD/SDIO DRIVER M: Chaotian Jing S: Maintained @@@ -14107,7 -14036,7 +14118,7 @@@ F: include/uapi/rdma/mlx5-abi. MELLANOX MLX5 VDPA DRIVER M: Dragos Tatulea -L: virtualization@lists.linux-foundation.org +L: virtualization@lists.linux.dev S: Supported F: drivers/vdpa/mlx5/ @@@ -14139,9 -14068,7 +14150,9 @@@ M: Mathieu Desnoyers L: linux-kernel@vger.kernel.org S: Supported -F: arch/powerpc/include/asm/membarrier.h +F: Documentation/scheduler/membarrier.rst +F: arch/*/include/asm/membarrier.h +F: arch/*/include/asm/sync_core.h F: include/uapi/linux/membarrier.h F: kernel/sched/membarrier.c @@@ -14195,35 -14122,15 +14206,35 @@@ T: git git://git.kernel.org/pub/scm/lin T: quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new F: include/linux/gfp.h F: include/linux/gfp_types.h +F: include/linux/memfd.h +F: include/linux/memory.h F: include/linux/memory_hotplug.h +F: include/linux/memory-tiers.h +F: include/linux/mempolicy.h +F: include/linux/mempool.h +F: include/linux/memremap.h F: include/linux/mm.h +F: include/linux/mm_*.h F: include/linux/mmzone.h +F: include/linux/mmu_notifier.h F: include/linux/pagewalk.h F: include/linux/rmap.h F: include/trace/events/ksm.h F: mm/ F: tools/mm/ F: tools/testing/selftests/mm/ +N: include/linux/page[-_]* + +MEMORY MAPPING +M: Andrew Morton +R: Liam R. Howlett +R: Vlastimil Babka +R: Lorenzo Stoakes +L: linux-mm@kvack.org +S: Maintained +W: http://www.linux-mm.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +F: mm/mmap.c MEMORY TECHNOLOGY DEVICES (MTD) M: Miquel Raynal @@@ -14352,6 -14259,7 +14363,6 @@@ F: drivers/misc/xilinx_tmr_manager. MICROCHIP AT91 DMA DRIVERS M: Ludovic Desroches -M: Tudor Ambarus L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: dmaengine@vger.kernel.org S: Supported @@@ -14400,8 -14308,9 +14411,8 @@@ F: Documentation/devicetree/bindings/me F: drivers/media/platform/microchip/microchip-csi2dc.c MICROCHIP ECC DRIVER -M: Tudor Ambarus L: linux-crypto@vger.kernel.org -S: Maintained +S: Orphan F: drivers/crypto/atmel-ecc.* MICROCHIP EIC DRIVER @@@ -14481,7 -14390,7 +14492,7 @@@ MICROCHIP MCP16502 PMIC DRIVE M: Claudiu Beznea L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported -F: Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt +F: Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml F: drivers/regulator/mcp16502.c MICROCHIP MCP3564 ADC DRIVER @@@ -14506,8 -14415,9 +14517,8 @@@ S: Maintaine F: drivers/mmc/host/atmel-mci.c MICROCHIP NAND DRIVER -M: Tudor Ambarus L: linux-mtd@lists.infradead.org -S: Supported +S: Orphan F: Documentation/devicetree/bindings/mtd/atmel-nand.txt F: drivers/mtd/nand/raw/atmel/* @@@ -14519,13 -14429,6 +14530,13 @@@ F: Documentation/devicetree/bindings/nv F: drivers/nvmem/microchip-otpc.c F: include/dt-bindings/nvmem/microchip,sama7g5-otpc.h +MICROCHIP PAC1934 POWER/ENERGY MONITOR DRIVER +M: Marius Cristea +L: linux-iio@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/iio/adc/microchip,pac1934.yaml +F: drivers/iio/adc/pac1934.c + MICROCHIP PCI1XXXX GP DRIVER M: Vaibhaav Ram T.L M: Kumaravel Thiagarajan @@@ -14682,14 -14585,6 +14693,14 @@@ F: Documentation/driver-api/surface_agg F: drivers/platform/surface/surface_dtx.c F: include/uapi/linux/surface_aggregator/dtx.h +MICROSOFT SURFACE SENSOR FAN DRIVER +M: Maximilian Luz +M: Ivor Wanders +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/surface_fan.rst +F: drivers/hwmon/surface_fan.c + MICROSOFT SURFACE GPE LID SUPPORT DRIVER M: Maximilian Luz L: platform-driver-x86@vger.kernel.org @@@ -14793,17 -14688,6 +14804,17 @@@ F: arch/mips F: drivers/platform/mips/ F: include/dt-bindings/mips/ +MIPS BAIKAL-T1 PLATFORM +M: Serge Semin +L: linux-mips@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/bus/baikal,bt1-*.yaml +F: Documentation/devicetree/bindings/clock/baikal,bt1-*.yaml +F: drivers/bus/bt1-*.c +F: drivers/clk/baikal-t1/ +F: drivers/memory/bt1-l2-ctl.c +F: drivers/mtd/maps/physmap-bt1-rom.[ch] + MIPS BOSTON DEVELOPMENT BOARD M: Paul Burton L: linux-mips@vger.kernel.org @@@ -14924,17 -14808,6 +14935,17 @@@ W: https://linuxtv.or Q: http://patchwork.linuxtv.org/project/linux-media/list/ F: drivers/media/dvb-frontends/mn88473* +MOBILEYE MIPS SOCS +M: Vladimir Kondratiev +M: Gregory CLEMENT +M: Théo Lebrun +L: linux-mips@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/mips/mobileye.yaml +F: arch/mips/boot/dts/mobileye/ +F: arch/mips/configs/eyeq5_defconfig +F: arch/mips/mobileye/board-epm5.its.S + MODULE SUPPORT M: Luis Chamberlain L: linux-modules@vger.kernel.org @@@ -15154,7 -15027,7 +15165,7 @@@ M: Marek Vasut L: dri-devel@lists.freedesktop.org S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/fsl,lcdif.yaml F: drivers/gpu/drm/mxsfb/ @@@ -15216,6 -15089,15 +15227,6 @@@ M: Samuel Mendoza-Jonas -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/hwmon/nct6775.rst -F: drivers/hwmon/nct6775-core.c -F: drivers/hwmon/nct6775-platform.c -F: drivers/hwmon/nct6775.h - NCT6775 HARDWARE MONITOR DRIVER - I2C DRIVER M: Zev Weiss L: linux-hwmon@vger.kernel.org @@@ -15227,7 -15109,6 +15238,7 @@@ NETDEVSI M: Jakub Kicinski S: Maintained F: drivers/net/netdevsim/* +F: tools/testing/selftests/drivers/net/netdevsim/* NETEM NETWORK EMULATOR M: Stephen Hemminger @@@ -15245,6 -15126,7 +15256,6 @@@ F: drivers/net/ethernet/neterion NETFILTER M: Pablo Neira Ayuso M: Jozsef Kadlecsik -M: Florian Westphal L: netfilter-devel@vger.kernel.org L: coreteam@netfilter.org S: Maintained @@@ -15576,6 -15458,7 +15587,6 @@@ M: Ryusuke Konishi M: Frederic Weisbecker -M: Thomas Gleixner M: Ingo Molnar +M: Thomas Gleixner L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz @@@ -15717,6 -15599,16 +15728,6 @@@ W: https://github.com/davejiang/linux/w T: git https://github.com/davejiang/linux.git F: drivers/ntb/hw/intel/ -NTFS FILESYSTEM -M: Anton Altaparmakov -R: Namjae Jeon -L: linux-ntfs-dev@lists.sourceforge.net -S: Supported -W: http://www.tuxera.com/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git -F: Documentation/filesystems/ntfs.rst -F: fs/ntfs/ - NTFS3 FILESYSTEM M: Konstantin Komarov L: ntfs3@lists.linux.dev @@@ -15845,7 -15737,7 +15856,7 @@@ F: drivers/iio/gyro/fxas21002c_spi. NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER M: Haibo Chen L: linux-iio@vger.kernel.org -L: linux-imx@nxp.com +L: imx@lists.linux.dev S: Maintained F: Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml F: Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml @@@ -15875,14 -15767,14 +15886,14 @@@ M: Laurentiu Palcu L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml F: drivers/gpu/drm/imx/dcss/ NXP i.MX 8QXP ADC DRIVER M: Cai Huoqing M: Haibo Chen -L: linux-imx@nxp.com +L: imx@lists.linux.dev L: linux-iio@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml @@@ -15890,7 -15782,7 +15901,7 @@@ F: drivers/iio/adc/imx8qxp-adc. NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER M: Mirela Rabulea -R: NXP Linux Team +L: imx@lists.linux.dev L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml @@@ -15900,7 -15792,7 +15911,7 @@@ NXP i.MX CLOCK DRIVER M: Abel Vesa R: Peng Fan L: linux-clk@vger.kernel.org -L: linux-imx@nxp.com +L: imx@lists.linux.dev S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx F: Documentation/devicetree/bindings/clock/imx* @@@ -15970,14 -15862,6 +15981,14 @@@ S: Maintaine F: Documentation/hwmon/nzxt-kraken2.rst F: drivers/hwmon/nzxt-kraken2.c +NZXT-KRAKEN3 HARDWARE MONITORING DRIVER +M: Jonas Malaco +M: Aleksa Savic +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/nzxt-kraken3.rst +F: drivers/hwmon/nzxt-kraken3.c + NZXT-SMART2 HARDWARE MONITORING DRIVER M: Aleksandr Mezin L: linux-hwmon@vger.kernel.org @@@ -16507,8 -16391,8 +16518,8 @@@ S: Supporte F: drivers/infiniband/ulp/opa_vnic OPEN FIRMWARE AND FLATTENED DEVICE TREE -M: Rob Herring -M: Frank Rowand +M: Rob Herring +M: Saravana Kannan L: devicetree@vger.kernel.org S: Maintained W: http://www.devicetree.org/ @@@ -16524,7 -16408,7 +16535,7 @@@ K: of_overlay_fdt_appl K: of_overlay_remove OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS -M: Rob Herring +M: Rob Herring M: Krzysztof Kozlowski M: Conor Dooley L: devicetree@vger.kernel.org @@@ -16631,7 -16515,7 +16642,7 @@@ M: Miklos Szeredi L: linux-unionfs@vger.kernel.org S: Supported -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git F: Documentation/filesystems/overlayfs.rst F: fs/overlayfs/ @@@ -16869,7 -16753,6 +16880,7 @@@ F: drivers/pci/controller/dwc/*layersca PCI DRIVER FOR FU740 M: Paul Walmsley M: Greentime Hu +M: Samuel Holland L: linux-pci@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml @@@ -17104,6 -16987,7 +17115,6 @@@ F: include/asm-generic/pci F: include/linux/of_pci.h F: include/linux/pci* F: include/uapi/linux/pci* -F: lib/pci* PCIE DRIVER FOR AMAZON ANNAPURNA LABS M: Jonathan Chocron @@@ -17408,12 -17292,9 +17419,12 @@@ M: Shawn Guo R: Pengutronix Kernel Team L: linux-gpio@vger.kernel.org +L: NXP S32 Linux Team S: Maintained F: Documentation/devicetree/bindings/pinctrl/fsl,* +F: Documentation/devicetree/bindings/pinctrl/nxp,s32* F: drivers/pinctrl/freescale/ +F: drivers/pinctrl/nxp/ PIN CONTROLLER - INTEL M: Mika Westerberg @@@ -17467,6 -17348,14 +17478,6 @@@ S: Supporte F: drivers/gpio/gpio-sama5d2-piobu.c F: drivers/pinctrl/pinctrl-at91* -PIN CONTROLLER - NXP S32 -M: Chester Lin -R: NXP S32 Linux Team -L: linux-gpio@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/pinctrl/nxp,s32* -F: drivers/pinctrl/nxp/ - PIN CONTROLLER - QUALCOMM M: Bjorn Andersson L: linux-arm-msm@vger.kernel.org @@@ -17483,6 -17372,7 +17494,6 @@@ F: Documentation/devicetree/bindings/pi F: drivers/pinctrl/renesas/ PIN CONTROLLER - SAMSUNG -M: Tomasz Figa M: Krzysztof Kozlowski M: Sylwester Nawrocki R: Alim Akhtar @@@ -17569,6 -17459,35 +17580,6 @@@ S: Maintaine F: Documentation/hwmon/pm6764tr.rst F: drivers/hwmon/pmbus/pm6764tr.c -PMBUS HARDWARE MONITORING DRIVERS -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -W: http://hwmon.wiki.kernel.org/ -W: http://www.roeck-us.net/linux/drivers/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git -F: Documentation/devicetree/bindings/hwmon/ltc2978.txt -F: Documentation/devicetree/bindings/hwmon/max31785.txt -F: Documentation/hwmon/adm1275.rst -F: Documentation/hwmon/ibm-cffps.rst -F: Documentation/hwmon/ir35221.rst -F: Documentation/hwmon/lm25066.rst -F: Documentation/hwmon/ltc2978.rst -F: Documentation/hwmon/ltc3815.rst -F: Documentation/hwmon/max16064.rst -F: Documentation/hwmon/max20751.rst -F: Documentation/hwmon/max31785.rst -F: Documentation/hwmon/max34440.rst -F: Documentation/hwmon/max8688.rst -F: Documentation/hwmon/pmbus-core.rst -F: Documentation/hwmon/pmbus.rst -F: Documentation/hwmon/tps40422.rst -F: Documentation/hwmon/ucd9000.rst -F: Documentation/hwmon/ucd9200.rst -F: Documentation/hwmon/zl6100.rst -F: drivers/hwmon/pmbus/ -F: include/linux/pmbus.h - PMC SIERRA MaxRAID DRIVER L: linux-scsi@vger.kernel.org S: Orphan @@@ -17596,20 -17515,14 +17607,20 @@@ F: drivers/pnp F: include/linux/pnp.h POSIX CLOCKS and TIMERS +M: Anna-Maria Behnsen +M: Frederic Weisbecker M: Thomas Gleixner L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core F: fs/timerfd.c F: include/linux/time_namespace.h -F: include/linux/timer* -F: kernel/time/*timer* +F: include/linux/timerfd.h +F: include/uapi/linux/time.h +F: include/uapi/linux/timerfd.h +F: include/trace/events/timer* +F: kernel/time/itimer.c +F: kernel/time/posix-* F: kernel/time/namespace.c POWER MANAGEMENT CORE @@@ -17645,7 -17558,6 +17656,7 @@@ F: Documentation/devicetree/bindings/po F: drivers/power/supply/ F: include/linux/power/ F: include/linux/power_supply.h +F: tools/testing/selftests/power_supply/ POWERNV OPERATOR PANEL LCD DISPLAY DRIVER M: Suraj Jitindar Singh @@@ -17737,7 -17649,7 +17748,7 @@@ M: Joel Granados +L: linux-hwmon@vger.kernel.org +S: Maintained +F: Documentation/hwmon/pt5161l.rst +F: drivers/hwmon/pt5161l.c + PTP HARDWARE CLOCK SUPPORT M: Richard Cochran L: netdev@vger.kernel.org @@@ -18100,34 -18005,33 +18111,34 @@@ F: drivers/media/tuners/qt1010 QUALCOMM ATH12K WIRELESS DRIVER M: Kalle Valo -M: Jeff Johnson +M: Jeff Johnson L: ath12k@lists.infradead.org S: Supported W: https://wireless.wiki.kernel.org/en/users/Drivers/ath12k T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git F: drivers/net/wireless/ath/ath12k/ +N: ath12k QUALCOMM ATHEROS ATH10K WIRELESS DRIVER M: Kalle Valo -M: Jeff Johnson +M: Jeff Johnson L: ath10k@lists.infradead.org S: Supported W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git -F: Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml F: drivers/net/wireless/ath/ath10k/ +N: ath10k QUALCOMM ATHEROS ATH11K WIRELESS DRIVER M: Kalle Valo -M: Jeff Johnson +M: Jeff Johnson L: ath11k@lists.infradead.org S: Supported W: https://wireless.wiki.kernel.org/en/users/Drivers/ath11k B: https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git -F: Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml F: drivers/net/wireless/ath/ath11k/ +N: ath11k QUALCOMM ATHEROS ATH9K WIRELESS DRIVER M: Toke Høiland-Jørgensen @@@ -18138,13 -18042,6 +18149,13 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml F: drivers/net/wireless/ath/ath9k/ +QUALCOMM ATHEROS QCA7K ETHERNET DRIVER +M: Stefan Wahren +L: netdev@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/net/qca,qca7000.txt +F: drivers/net/ethernet/qualcomm/qca* + QUALCOMM BAM-DMUX WWAN NETWORK DRIVER M: Stephan Gerhold L: netdev@vger.kernel.org @@@ -18179,7 -18076,7 +18190,7 @@@ R: Pranjal Ramajor Asha Kanojiya L: linux-edac@vger.kernel.org S: Maintained -F: Documentation/admin-guide/ras.rst +F: Documentation/admin-guide/RAS F: drivers/ras/ F: include/linux/ras.h F: include/ras/ras_event.h +RAS FRU MEMORY POISON MANAGER (FMPM) +M: Yazen Ghannam +L: linux-edac@vger.kernel.org +S: Maintained +F: drivers/ras/amd/fmpm.c + RC-CORE / LIRC FRAMEWORK M: Sean Young L: linux-media@vger.kernel.org @@@ -18656,21 -18547,18 +18667,21 @@@ REALTEK WIRELESS DRIVER (rtlwifi family M: Ping-Ke Shih L: linux-wireless@vger.kernel.org S: Maintained +T: git https://github.com/pkshih/rtw.git F: drivers/net/wireless/realtek/rtlwifi/ REALTEK WIRELESS DRIVER (rtw88) M: Ping-Ke Shih L: linux-wireless@vger.kernel.org S: Maintained +T: git https://github.com/pkshih/rtw.git F: drivers/net/wireless/realtek/rtw88/ REALTEK WIRELESS DRIVER (rtw89) M: Ping-Ke Shih L: linux-wireless@vger.kernel.org S: Maintained +T: git https://github.com/pkshih/rtw.git F: drivers/net/wireless/realtek/rtw89/ REDPINE WIRELESS DRIVER @@@ -18741,24 -18629,13 +18752,24 @@@ S: Supporte F: Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml F: drivers/i2c/busses/i2c-emev2.c -RENESAS ETHERNET DRIVERS +RENESAS ETHERNET AVB DRIVER R: Sergey Shtylyov L: netdev@vger.kernel.org L: linux-renesas-soc@vger.kernel.org -F: Documentation/devicetree/bindings/net/renesas,*.yaml -F: drivers/net/ethernet/renesas/ -F: include/linux/sh_eth.h +F: Documentation/devicetree/bindings/net/renesas,etheravb.yaml +F: drivers/net/ethernet/renesas/Kconfig +F: drivers/net/ethernet/renesas/Makefile +F: drivers/net/ethernet/renesas/ravb* + +RENESAS ETHERNET SWITCH DRIVER +R: Yoshihiro Shimoda +L: netdev@vger.kernel.org +L: linux-renesas-soc@vger.kernel.org +F: Documentation/devicetree/bindings/net/renesas,*ether-switch.yaml +F: drivers/net/ethernet/renesas/Kconfig +F: drivers/net/ethernet/renesas/Makefile +F: drivers/net/ethernet/renesas/rcar_gen4* +F: drivers/net/ethernet/renesas/rswitch* RENESAS IDT821034 ASoC CODEC M: Herve Codina @@@ -18868,16 -18745,6 +18879,16 @@@ S: Supporte F: Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml F: drivers/i2c/busses/i2c-rzv2m.c +RENESAS SUPERH ETHERNET DRIVER +R: Sergey Shtylyov +L: netdev@vger.kernel.org +L: linux-renesas-soc@vger.kernel.org +F: Documentation/devicetree/bindings/net/renesas,ether.yaml +F: drivers/net/ethernet/renesas/Kconfig +F: drivers/net/ethernet/renesas/Makefile +F: drivers/net/ethernet/renesas/sh_eth* +F: include/linux/sh_eth.h + RENESAS USB PHY DRIVER M: Yoshihiro Shimoda L: linux-renesas-soc@vger.kernel.org @@@ -19012,7 -18879,6 +19023,7 @@@ F: Documentation/devicetree/bindings/ri F: arch/riscv/boot/dts/ X: arch/riscv/boot/dts/allwinner/ X: arch/riscv/boot/dts/renesas/ +X: arch/riscv/boot/dts/sophgo/ RISC-V PMU DRIVERS M: Atish Patra @@@ -19214,14 -19080,12 +19225,14 @@@ M: Hin-Tak Leung L: linux-wireless@vger.kernel.org S: Maintained +T: git https://github.com/pkshih/rtw.git F: drivers/net/wireless/realtek/rtl818x/rtl8187/ RTL8XXXU WIRELESS DRIVER (rtl8xxxu) M: Jes Sorensen L: linux-wireless@vger.kernel.org S: Maintained +T: git https://github.com/pkshih/rtw.git F: drivers/net/wireless/realtek/rtl8xxxu/ RTRS TRANSPORT DRIVERS @@@ -19263,7 -19127,6 +19274,7 @@@ F: Documentation/rust F: rust/ F: samples/rust/ F: scripts/*rust* +F: tools/testing/selftests/rust/ K: \b(?i:rust)\b RXRPC SOCKETS (AF_RXRPC) @@@ -19557,6 -19420,7 +19568,6 @@@ F: drivers/media/platform/samsung/exyno SAMSUNG SOC CLOCK DRIVERS M: Krzysztof Kozlowski M: Sylwester Nawrocki -M: Tomasz Figa M: Chanwoo Choi R: Alim Akhtar L: linux-samsung-soc@vger.kernel.org @@@ -19798,7 -19662,7 +19809,7 @@@ F: drivers/mmc/host/sdhci-of-at91. SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER M: Haibo Chen -L: linux-imx@nxp.com +L: imx@lists.linux.dev L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-esdhc-imx.c @@@ -20133,15 -19997,36 +20144,15 @@@ S: Maintaine F: drivers/watchdog/simatic-ipc-wdt.c SIFIVE DRIVERS -M: Palmer Dabbelt M: Paul Walmsley +M: Samuel Holland L: linux-riscv@lists.infradead.org S: Supported +F: drivers/dma/sf-pdma/ N: sifive +K: fu[57]40 K: [^@]sifive -SIFIVE CACHE DRIVER -M: Conor Dooley -L: linux-riscv@lists.infradead.org -S: Maintained -F: Documentation/devicetree/bindings/cache/sifive,ccache0.yaml -F: drivers/cache/sifive_ccache.c - -SIFIVE FU540 SYSTEM-ON-CHIP -M: Paul Walmsley -M: Palmer Dabbelt -L: linux-riscv@lists.infradead.org -S: Supported -T: git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git -N: fu540 -K: fu540 - -SIFIVE PDMA DRIVER -M: Green Wan -S: Maintained -F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml -F: drivers/dma/sf-pdma/ - - SILEAD TOUCHSCREEN DRIVER M: Hans de Goede L: linux-input@vger.kernel.org @@@ -20350,8 -20235,8 +20361,8 @@@ F: Documentation/devicetree/bindings/ne F: drivers/net/ethernet/socionext/sni_ave.c SOCIONEXT (SNI) NETSEC NETWORK DRIVER -M: Jassi Brar M: Ilias Apalodimas +M: Masahisa Kojima L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml @@@ -20592,13 -20477,12 +20603,13 @@@ F: drivers/char/sonypi. F: drivers/platform/x86/sony-laptop.c F: include/linux/sony-laptop.h -SOPHGO DEVICETREES -M: Chao Wei +SOPHGO DEVICETREES and DRIVERS M: Chen Wang +M: Inochi Amaoto +T: git https://github.com/sophgo/linux.git S: Maintained -F: arch/riscv/boot/dts/sophgo/ -F: Documentation/devicetree/bindings/riscv/sophgo.yaml +N: sophgo +K: sophgo SOUND M: Jaroslav Kysela @@@ -20632,12 -20516,6 +20643,12 @@@ F: include/uapi/sound/compress_ F: sound/core/compress_offload.c F: sound/soc/soc-compress.c +SOUND - CORE KUNIT TEST +M: Ivan Orlov +L: linux-sound@vger.kernel.org +S: Supported +F: sound/core/sound_kunit.c + SOUND - DMAENGINE HELPERS M: Lars-Peter Clausen S: Supported @@@ -21090,13 -20968,6 +21101,13 @@@ S: Maintaine T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ F: Documentation/devicetree/bindings/soc/starfive/ +STARFIVE STARLINK PMU DRIVER +M: Ji Sheng Teoh +S: Maintained +F: Documentation/admin-guide/perf/starfive_starlink_pmu.rst +F: Documentation/devicetree/bindings/perf/starfive,jh8100-starlink-pmu.yaml +F: drivers/perf/starfive_starlink_pmu.c + STARFIVE TRNG DRIVER M: Jia Jie Ho S: Supported @@@ -21118,12 -20989,6 +21129,12 @@@ F: Documentation/devicetree/bindings/ph F: drivers/phy/starfive/phy-jh7110-pcie.c F: drivers/phy/starfive/phy-jh7110-usb.c +STARFIVE JH8100 EXTERNAL INTERRUPT CONTROLLER DRIVER +M: Changhuang Liang +S: Supported +F: Documentation/devicetree/bindings/interrupt-controller/starfive,jh8100-intc.yaml +F: drivers/irqchip/irq-starfive-jh8100-intc.c + STATIC BRANCH/CALL M: Peter Zijlstra M: Josh Poimboeuf @@@ -21331,7 -21196,7 +21342,7 @@@ R: Gustavo Padovan M: Greg Kroah-Hartman -L: tech-board-discuss@lists.linux-foundation.org +L: tech-board-discuss@lists.linux.dev S: Maintained F: Documentation/process/contribution-maturity-model.rst F: Documentation/process/researcher-guidelines.rst @@@ -22109,6 -21973,7 +22120,6 @@@ F: drivers/i2c/busses/i2c-davinci. TI DAVINCI SERIES CLOCK DRIVER M: David Lechner -R: Sekhar Nori S: Maintained F: Documentation/devicetree/bindings/clock/ti/davinci/ F: drivers/clk/davinci/ @@@ -22291,20 -22156,13 +22302,20 @@@ S: Supporte T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core F: include/linux/clocksource.h F: include/linux/time.h +F: include/linux/timekeeper_internal.h +F: include/linux/timekeeping.h F: include/linux/timex.h F: include/uapi/linux/time.h F: include/uapi/linux/timex.h F: kernel/time/alarmtimer.c -F: kernel/time/clocksource.c -F: kernel/time/ntp.c -F: kernel/time/time*.c +F: kernel/time/clocksource* +F: kernel/time/ntp* +F: kernel/time/time.c +F: kernel/time/timeconst.bc +F: kernel/time/timeconv.c +F: kernel/time/timecounter.c +F: kernel/time/timekeeping* +F: kernel/time/time_test.c F: tools/testing/selftests/timers/ TIPC NETWORK LAYER @@@ -22334,6 -22192,22 +22345,6 @@@ F: drivers/mmc/host/renesas_sdhi F: drivers/mmc/host/tmio_mmc* F: include/linux/mfd/tmio.h -TMP401 HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml -F: Documentation/hwmon/tmp401.rst -F: drivers/hwmon/tmp401.c - -TMP464 HARDWARE MONITOR DRIVER -M: Guenter Roeck -L: linux-hwmon@vger.kernel.org -S: Maintained -F: Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml -F: Documentation/hwmon/tmp464.rst -F: drivers/hwmon/tmp464.c - TMP513 HARDWARE MONITOR DRIVER M: Eric Tremblay L: linux-hwmon@vger.kernel.org @@@ -22620,7 -22494,6 +22631,7 @@@ F: include/uapi/misc/uacce UBI FILE SYSTEM (UBIFS) M: Richard Weinberger +R: Zhihao Cheng L: linux-mtd@lists.infradead.org S: Supported W: http://www.linux-mtd.infradead.org/doc/ubifs.html @@@ -22639,23 -22512,6 +22650,23 @@@ F: Documentation/block/ublk.rs F: drivers/block/ublk_drv.c F: include/uapi/linux/ublk_cmd.h +UBSAN +M: Kees Cook +R: Marco Elver +R: Andrey Konovalov +R: Andrey Ryabinin +L: kasan-dev@googlegroups.com +L: linux-hardening@vger.kernel.org +S: Supported +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening +F: Documentation/dev-tools/ubsan.rst +F: include/linux/ubsan.h +F: lib/Kconfig.ubsan +F: lib/test_ubsan.c +F: lib/ubsan.c +F: scripts/Makefile.ubsan +K: \bARCH_HAS_UBSAN\b + UCLINUX (M68KNOMMU AND COLDFIRE) M: Greg Ungerer L: linux-m68k@lists.linux-m68k.org @@@ -22766,7 -22622,6 +22777,7 @@@ F: drivers/ufs/host/ufs-renesas. UNSORTED BLOCK IMAGES (UBI) M: Richard Weinberger +R: Zhihao Cheng L: linux-mtd@lists.infradead.org S: Supported W: http://www.linux-mtd.infradead.org/ @@@ -23113,7 -22968,7 +23124,7 @@@ USERSPACE DMA BUFFER DRIVE M: Gerd Hoffmann L: dri-devel@lists.freedesktop.org S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/dma-buf/udmabuf.c F: include/uapi/linux/udmabuf.h @@@ -23256,11 -23111,12 +23267,11 @@@ L: kvm@vger.kernel.or S: Maintained F: drivers/vfio/pci/mlx5/ -VFIO VIRTIO PCI DRIVER -M: Yishai Hadas +VFIO NVIDIA GRACE GPU DRIVER +M: Ankit Agrawal L: kvm@vger.kernel.org -L: virtualization@lists.linux-foundation.org -S: Maintained -F: drivers/vfio/pci/virtio +S: Supported +F: drivers/vfio/pci/nvgrace-gpu/ VFIO PCI DEVICE SPECIFIC DRIVERS R: Jason Gunthorpe @@@ -23285,17 -23141,10 +23296,17 @@@ L: kvm@vger.kernel.or S: Maintained F: drivers/vfio/platform/ +VFIO VIRTIO PCI DRIVER +M: Yishai Hadas +L: kvm@vger.kernel.org +L: virtualization@lists.linux.dev +S: Maintained +F: drivers/vfio/pci/virtio + VGA_SWITCHEROO R: Lukas Wunner S: Maintained - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: Documentation/gpu/vga-switcheroo.rst F: drivers/gpu/vga/vga_switcheroo.c F: include/linux/vga_switcheroo.h @@@ -23488,7 -23337,7 +23499,7 @@@ R: Chia-I Wu -R: VMware PV-Drivers Reviewers +M: Jerrin Shaji George +R: Broadcom internal kernel review list L: linux-kernel@vger.kernel.org S: Supported F: drivers/misc/vmw_balloon.c @@@ -24309,13 -24158,14 +24320,13 @@@ F: drivers/net/ethernet/xilinx/xilinx_a XILINX CAN DRIVER M: Appana Durga Kedareswara rao -R: Naga Sureshkumar Relli L: linux-can@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/can/xilinx,can.yaml F: drivers/net/can/xilinx_can.c XILINX EVENT MANAGEMENT DRIVER -M: Abhyuday Godhasara +M: Michal Simek S: Maintained F: drivers/soc/xilinx/xlnx_event_manager.c F: include/linux/firmware/xlnx-event-manager.h @@@ -24345,7 -24195,7 +24356,7 @@@ XILINX SD-FEC IP CORE M: Derek Kiernan M: Dragan Cvetic S: Maintained -F: Documentation/devicetree/bindings/misc/xlnx,sd-fec.txt +F: Documentation/devicetree/bindings/misc/xlnx,sd-fec.yaml F: Documentation/misc-devices/xilinx_sdfec.rst F: drivers/misc/Kconfig F: drivers/misc/Makefile @@@ -24423,14 -24273,6 +24434,14 @@@ M: Harsha +M: Kalyani Akula +R: Michal Simek +S: Maintained +F: Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml +F: drivers/nvmem/zynqmp_nvmem.c + XILLYBUS DRIVER M: Eli Billauer L: linux-kernel@vger.kernel.org @@@ -24585,7 -24427,6 +24596,7 @@@ ZSWAP COMPRESSED SWAP CACHIN M: Johannes Weiner M: Yosry Ahmed M: Nhat Pham +R: Chengming Zhou L: linux-mm@kvack.org S: Maintained F: Documentation/admin-guide/mm/zswap.rst @@@ -24593,7 -24434,6 +24604,7 @@@ F: include/linux/zpool. F: include/linux/zswap.h F: mm/zpool.c F: mm/zswap.c +F: tools/testing/selftests/cgroup/test_zswap.c THE REST M: Linus Torvalds diff --combined drivers/gpu/drm/Kconfig index 5a0c476361c3,70a2ac0ca9fd..3914aaf443a8 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@@ -68,19 -68,21 +68,21 @@@ config DRM_USE_DYNAMIC_DEBU config DRM_KUNIT_TEST_HELPERS tristate depends on DRM && KUNIT + select DRM_KMS_HELPER help KUnit Helpers for KMS drivers. config DRM_KUNIT_TEST tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS - depends on DRM && KUNIT && MMU + depends on DRM + depends on DRM_DISPLAY_DP_HELPER + depends on DRM_DISPLAY_HELPER + depends on KUNIT + depends on MMU select DRM_BUDDY - select DRM_DISPLAY_DP_HELPER - select DRM_DISPLAY_HELPER select DRM_EXEC select DRM_EXPORT_FOR_TESTS if m select DRM_GEM_SHMEM_HELPER - select DRM_KMS_HELPER select DRM_KUNIT_TEST_HELPERS select DRM_LIB_RANDOM select PRIME_NUMBERS @@@ -198,7 -200,7 +200,7 @@@ config DRM_TT config DRM_TTM_KUNIT_TEST tristate "KUnit tests for TTM" if !KUNIT_ALL_TESTS default n - depends on DRM && KUNIT && MMU + depends on DRM && KUNIT && MMU && (UML || COMPILE_TEST) select DRM_TTM select DRM_EXPORT_FOR_TESTS if m select DRM_KUNIT_TEST_HELPERS @@@ -206,8 -208,7 +208,8 @@@ help Enables unit tests for TTM, a GPU memory manager subsystem used to manage memory buffers. This option is mostly useful for kernel - developers. + developers. It depends on (UML || COMPILE_TEST) since no other driver + which uses TTM can be loaded while running the tests. If in doubt, say "N". @@@ -371,6 -372,8 +373,8 @@@ source "drivers/gpu/drm/lima/Kconfig source "drivers/gpu/drm/panfrost/Kconfig" + source "drivers/gpu/drm/panthor/Kconfig" + source "drivers/gpu/drm/aspeed/Kconfig" source "drivers/gpu/drm/mcde/Kconfig" @@@ -414,3 -417,16 +418,16 @@@ config DRM_LIB_RANDO config DRM_PRIVACY_SCREEN bool default n + + config DRM_WERROR + bool "Compile the drm subsystem with warnings as errors" + depends on DRM && EXPERT + default n + help + A kernel build should not cause any compiler warnings, and this + enables the '-Werror' flag to enforce that rule in the drm subsystem. + + The drm subsystem enables more warnings than the kernel default, so + this config option is disabled by default. + + If in doubt, say N. diff --combined drivers/gpu/drm/display/drm_dp_helper.c index f5d4be897866,66a1785447b8..88dca26189b9 --- a/drivers/gpu/drm/display/drm_dp_helper.c +++ b/drivers/gpu/drm/display/drm_dp_helper.c @@@ -2113,7 -2113,7 +2113,7 @@@ EXPORT_SYMBOL(drm_dp_aux_init) * drm_dp_aux_register() in &drm_connector_funcs.late_register, and likewise to * call drm_dp_aux_unregister() in &drm_connector_funcs.early_unregister. * Functions which don't follow this will likely Oops when - * %CONFIG_DRM_DP_AUX_CHARDEV is enabled. + * %CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is enabled. * * For devices where the AUX channel is a device that exists independently of * the &drm_device that uses it, such as SoCs and bridge devices, it is @@@ -4111,13 -4111,6 +4111,13 @@@ int drm_dp_bw_overhead(int lane_count, u32 overhead = 1000000; int symbol_cycles; + if (lane_count == 0 || hactive == 0 || bpp_x16 == 0) { + DRM_DEBUG_KMS("Invalid BW overhead params: lane_count %d, hactive %d, bpp_x16 %d.%04d\n", + lane_count, hactive, + bpp_x16 >> 4, (bpp_x16 & 0xf) * 625); + return 0; + } + /* * DP Standard v2.1 2.6.4.1 * SSC downspread and ref clock variation margin: diff --combined drivers/gpu/drm/drm_gem_vram_helper.c index 1ac284a9e8ee,45650b9b3de9..6027584406af --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@@ -258,7 -258,8 +258,7 @@@ static u64 drm_gem_vram_pg_offset(struc } /** - * drm_gem_vram_offset() - \ - Returns a GEM VRAM object's offset in video memory + * drm_gem_vram_offset() - Returns a GEM VRAM object's offset in video memory * @gbo: the GEM VRAM object * * This function returns the buffer object's offset in the device's video @@@ -282,6 -283,8 +282,8 @@@ static int drm_gem_vram_pin_locked(stru struct ttm_operation_ctx ctx = { false, false }; int ret; + dma_resv_assert_held(gbo->bo.base.resv); + if (gbo->bo.pin_count) goto out; @@@ -337,6 -340,8 +339,8 @@@ EXPORT_SYMBOL(drm_gem_vram_pin) static void drm_gem_vram_unpin_locked(struct drm_gem_vram_object *gbo) { + dma_resv_assert_held(gbo->bo.base.resv); + ttm_bo_unpin(&gbo->bo); } @@@ -363,11 -368,28 +367,28 @@@ int drm_gem_vram_unpin(struct drm_gem_v } EXPORT_SYMBOL(drm_gem_vram_unpin); - static int drm_gem_vram_kmap_locked(struct drm_gem_vram_object *gbo, - struct iosys_map *map) + /** + * drm_gem_vram_vmap() - Pins and maps a GEM VRAM object into kernel address + * space + * @gbo: The GEM VRAM object to map + * @map: Returns the kernel virtual address of the VRAM GEM object's backing + * store. + * + * The vmap function pins a GEM VRAM object to its current location, either + * system or video memory, and maps its buffer into kernel address space. + * As pinned object cannot be relocated, you should avoid pinning objects + * permanently. Call drm_gem_vram_vunmap() with the returned address to + * unmap and unpin the GEM VRAM object. + * + * Returns: + * 0 on success, or a negative error code otherwise. + */ + int drm_gem_vram_vmap(struct drm_gem_vram_object *gbo, struct iosys_map *map) { int ret; + dma_resv_assert_held(gbo->bo.base.resv); + if (gbo->vmap_use_count > 0) goto out; @@@ -388,12 -410,23 +409,23 @@@ out return 0; } + EXPORT_SYMBOL(drm_gem_vram_vmap); - static void drm_gem_vram_kunmap_locked(struct drm_gem_vram_object *gbo, - struct iosys_map *map) + /** + * drm_gem_vram_vunmap() - Unmaps and unpins a GEM VRAM object + * @gbo: The GEM VRAM object to unmap + * @map: Kernel virtual address where the VRAM GEM object was mapped + * + * A call to drm_gem_vram_vunmap() unmaps and unpins a GEM VRAM buffer. See + * the documentation for drm_gem_vram_vmap() for more information. + */ + void drm_gem_vram_vunmap(struct drm_gem_vram_object *gbo, + struct iosys_map *map) { struct drm_device *dev = gbo->bo.base.dev; + dma_resv_assert_held(gbo->bo.base.resv); + if (drm_WARN_ON_ONCE(dev, !gbo->vmap_use_count)) return; @@@ -410,72 -443,17 +442,18 @@@ * from memory. See drm_gem_vram_bo_driver_move_notify(). */ } - - /** - * drm_gem_vram_vmap() - Pins and maps a GEM VRAM object into kernel address - * space - * @gbo: The GEM VRAM object to map - * @map: Returns the kernel virtual address of the VRAM GEM object's backing - * store. - * - * The vmap function pins a GEM VRAM object to its current location, either - * system or video memory, and maps its buffer into kernel address space. - * As pinned object cannot be relocated, you should avoid pinning objects - * permanently. Call drm_gem_vram_vunmap() with the returned address to - * unmap and unpin the GEM VRAM object. - * - * Returns: - * 0 on success, or a negative error code otherwise. - */ - int drm_gem_vram_vmap(struct drm_gem_vram_object *gbo, struct iosys_map *map) - { - int ret; - - dma_resv_assert_held(gbo->bo.base.resv); - - ret = drm_gem_vram_pin_locked(gbo, 0); - if (ret) - return ret; - ret = drm_gem_vram_kmap_locked(gbo, map); - if (ret) - goto err_drm_gem_vram_unpin_locked; - - return 0; - - err_drm_gem_vram_unpin_locked: - drm_gem_vram_unpin_locked(gbo); - return ret; - } - EXPORT_SYMBOL(drm_gem_vram_vmap); - - /** - * drm_gem_vram_vunmap() - Unmaps and unpins a GEM VRAM object - * @gbo: The GEM VRAM object to unmap - * @map: Kernel virtual address where the VRAM GEM object was mapped - * - * A call to drm_gem_vram_vunmap() unmaps and unpins a GEM VRAM buffer. See - * the documentation for drm_gem_vram_vmap() for more information. - */ - void drm_gem_vram_vunmap(struct drm_gem_vram_object *gbo, - struct iosys_map *map) - { - dma_resv_assert_held(gbo->bo.base.resv); - - drm_gem_vram_kunmap_locked(gbo, map); - drm_gem_vram_unpin_locked(gbo); - } EXPORT_SYMBOL(drm_gem_vram_vunmap); /** - * drm_gem_vram_fill_create_dumb() - \ - Helper for implementing &struct drm_driver.dumb_create + * drm_gem_vram_fill_create_dumb() - Helper for implementing + * &struct drm_driver.dumb_create + * * @file: the DRM file * @dev: the DRM device * @pg_align: the buffer's alignment in multiples of the page size * @pitch_align: the scanline's alignment in powers of 2 - * @args: the arguments as provided to \ - &struct drm_driver.dumb_create + * @args: the arguments as provided to + * &struct drm_driver.dumb_create * * This helper function fills &struct drm_mode_create_dumb, which is used * by &struct drm_driver.dumb_create. Implementations of this interface @@@ -573,7 -551,8 +551,7 @@@ static int drm_gem_vram_bo_driver_move( */ /** - * drm_gem_vram_object_free() - \ - Implements &struct drm_gem_object_funcs.free + * drm_gem_vram_object_free() - Implements &struct drm_gem_object_funcs.free * @gem: GEM object. Refers to &struct drm_gem_vram_object.gem */ static void drm_gem_vram_object_free(struct drm_gem_object *gem) @@@ -588,11 -567,12 +566,11 @@@ */ /** - * drm_gem_vram_driver_dumb_create() - \ - Implements &struct drm_driver.dumb_create + * drm_gem_vram_driver_dumb_create() - Implements &struct drm_driver.dumb_create * @file: the DRM file * @dev: the DRM device - * @args: the arguments as provided to \ - &struct drm_driver.dumb_create + * @args: the arguments as provided to + * &struct drm_driver.dumb_create * * This function requires the driver to use @drm_device.vram_mm for its * instance of VRAM MM. @@@ -635,8 -615,8 +613,8 @@@ static void __drm_gem_vram_plane_helper } /** - * drm_gem_vram_plane_helper_prepare_fb() - \ - * Implements &struct drm_plane_helper_funcs.prepare_fb + * drm_gem_vram_plane_helper_prepare_fb() - Implements &struct + * drm_plane_helper_funcs.prepare_fb * @plane: a DRM plane * @new_state: the plane's new state * @@@ -686,8 -666,8 +664,8 @@@ err_drm_gem_vram_unpin EXPORT_SYMBOL(drm_gem_vram_plane_helper_prepare_fb); /** - * drm_gem_vram_plane_helper_cleanup_fb() - \ - * Implements &struct drm_plane_helper_funcs.cleanup_fb + * drm_gem_vram_plane_helper_cleanup_fb() - Implements &struct + * drm_plane_helper_funcs.cleanup_fb * @plane: a DRM plane * @old_state: the plane's old state * @@@ -713,8 -693,8 +691,8 @@@ EXPORT_SYMBOL(drm_gem_vram_plane_helper */ /** - * drm_gem_vram_simple_display_pipe_prepare_fb() - \ - * Implements &struct drm_simple_display_pipe_funcs.prepare_fb + * drm_gem_vram_simple_display_pipe_prepare_fb() - Implements &struct + * drm_simple_display_pipe_funcs.prepare_fb * @pipe: a simple display pipe * @new_state: the plane's new state * @@@ -735,8 -715,8 +713,8 @@@ int drm_gem_vram_simple_display_pipe_pr EXPORT_SYMBOL(drm_gem_vram_simple_display_pipe_prepare_fb); /** - * drm_gem_vram_simple_display_pipe_cleanup_fb() - \ - * Implements &struct drm_simple_display_pipe_funcs.cleanup_fb + * drm_gem_vram_simple_display_pipe_cleanup_fb() - Implements &struct + * drm_simple_display_pipe_funcs.cleanup_fb * @pipe: a simple display pipe * @old_state: the plane's old state * @@@ -757,7 -737,8 +735,7 @@@ EXPORT_SYMBOL(drm_gem_vram_simple_displ */ /** - * drm_gem_vram_object_pin() - \ - Implements &struct drm_gem_object_funcs.pin + * drm_gem_vram_object_pin() - Implements &struct drm_gem_object_funcs.pin * @gem: The GEM object to pin * * Returns: @@@ -768,7 -749,8 +746,8 @@@ static int drm_gem_vram_object_pin(stru { struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(gem); - /* Fbdev console emulation is the use case of these PRIME + /* + * Fbdev console emulation is the use case of these PRIME * helpers. This may involve updating a hardware buffer from * a shadow FB. We pin the buffer to it's current location * (either video RAM or system memory) to prevent it from @@@ -776,18 -758,19 +755,18 @@@ * the buffer to be pinned to VRAM, implement a callback that * sets the flags accordingly. */ - return drm_gem_vram_pin(gbo, 0); + return drm_gem_vram_pin_locked(gbo, 0); } /** - * drm_gem_vram_object_unpin() - \ - Implements &struct drm_gem_object_funcs.unpin + * drm_gem_vram_object_unpin() - Implements &struct drm_gem_object_funcs.unpin * @gem: The GEM object to unpin */ static void drm_gem_vram_object_unpin(struct drm_gem_object *gem) { struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(gem); - drm_gem_vram_unpin(gbo); + drm_gem_vram_unpin_locked(gbo); } /** diff --combined drivers/gpu/drm/nouveau/nouveau_abi16.c index 80f74ee0fc78,92f9127b284a..f465fe93b1f7 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@@ -269,7 -269,7 +269,7 @@@ nouveau_abi16_ioctl_getparam(ABI16_IOCT break; case NOUVEAU_GETPARAM_VRAM_USED: { struct ttm_resource_manager *vram_mgr = ttm_manager_type(&drm->ttm.bdev, TTM_PL_VRAM); - getparam->value = (u64)ttm_resource_manager_usage(vram_mgr) << PAGE_SHIFT; + getparam->value = (u64)ttm_resource_manager_usage(vram_mgr); break; } default: @@@ -312,11 -312,21 +312,21 @@@ nouveau_abi16_ioctl_channel_alloc(ABI16 if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) { if (init->fb_ctxdma_handle == ~0) { switch (init->tt_ctxdma_handle) { - case 0x01: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_GR ; break; - case 0x02: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPDEC; break; - case 0x04: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPPP ; break; - case 0x08: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSVLD ; break; - case 0x30: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_CE ; break; + case NOUVEAU_FIFO_ENGINE_GR: + engine = NV_DEVICE_HOST_RUNLIST_ENGINES_GR; + break; + case NOUVEAU_FIFO_ENGINE_VP: + engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPDEC; + break; + case NOUVEAU_FIFO_ENGINE_PPP: + engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPPP; + break; + case NOUVEAU_FIFO_ENGINE_BSP: + engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSVLD; + break; + case NOUVEAU_FIFO_ENGINE_CE: + engine = NV_DEVICE_HOST_RUNLIST_ENGINES_CE; + break; default: return nouveau_abi16_put(abi16, -ENOSYS); } diff --combined drivers/gpu/drm/nouveau/nouveau_bo.c index db8cbf615112,4a7c002a325a..1e2d28fd10dc --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@@ -467,17 -467,14 +467,14 @@@ nouveau_bo_placement_set(struct nouveau set_placement_range(nvbo, domain); } - int - nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t domain, bool contig) + int nouveau_bo_pin_locked(struct nouveau_bo *nvbo, uint32_t domain, bool contig) { struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct ttm_buffer_object *bo = &nvbo->bo; bool force = false, evict = false; - int ret; + int ret = 0; - ret = ttm_bo_reserve(bo, false, false, NULL); - if (ret) - return ret; + dma_resv_assert_held(bo->base.resv); if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA && domain == NOUVEAU_GEM_DOMAIN_VRAM && contig) { @@@ -540,20 -537,15 +537,15 @@@ out: if (force && ret) nvbo->contig = false; - ttm_bo_unreserve(bo); return ret; } - int - nouveau_bo_unpin(struct nouveau_bo *nvbo) + void nouveau_bo_unpin_locked(struct nouveau_bo *nvbo) { struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct ttm_buffer_object *bo = &nvbo->bo; - int ret; - ret = ttm_bo_reserve(bo, false, false, NULL); - if (ret) - return ret; + dma_resv_assert_held(bo->base.resv); ttm_bo_unpin(&nvbo->bo); if (!nvbo->bo.pin_count) { @@@ -568,8 -560,33 +560,33 @@@ break; } } + } + + int nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t domain, bool contig) + { + struct ttm_buffer_object *bo = &nvbo->bo; + int ret; + ret = ttm_bo_reserve(bo, false, false, NULL); + if (ret) + return ret; + ret = nouveau_bo_pin_locked(nvbo, domain, contig); + ttm_bo_unreserve(bo); + + return ret; + } + + int nouveau_bo_unpin(struct nouveau_bo *nvbo) + { + struct ttm_buffer_object *bo = &nvbo->bo; + int ret; + + ret = ttm_bo_reserve(bo, false, false, NULL); + if (ret) + return ret; + nouveau_bo_unpin_locked(nvbo); ttm_bo_unreserve(bo); + return 0; } @@@ -1256,8 -1273,6 +1273,8 @@@ out drm_vma_node_unmap(&nvbo->bo.base.vma_node, bdev->dev_mapping); nouveau_ttm_io_mem_free_locked(drm, nvbo->bo.resource); + nvbo->bo.resource->bus.offset = 0; + nvbo->bo.resource->bus.addr = NULL; goto retry; } diff --combined include/drm/drm_gem_vram_helper.h index 2938ba80750d,c89c9bafeb44..9a73f786f4ad --- a/include/drm/drm_gem_vram_helper.h +++ b/include/drm/drm_gem_vram_helper.h @@@ -33,8 -33,8 +33,8 @@@ struct vm_area_struct * struct drm_gem_vram_object - GEM object backed by VRAM * @bo: TTM buffer object * @map: Mapping information for @bo - * @placement: TTM placement information. Supported placements are \ - %TTM_PL_VRAM and %TTM_PL_SYSTEM + * @placement: TTM placement information. Supported placements are %TTM_PL_VRAM + * and %TTM_PL_SYSTEM * @placements: TTM placement information. * * The type struct drm_gem_vram_object represents a GEM object that is @@@ -126,8 -126,8 +126,8 @@@ drm_gem_vram_plane_helper_cleanup_fb(st struct drm_plane_state *old_state); /** - * DRM_GEM_VRAM_PLANE_HELPER_FUNCS - - * Initializes struct drm_plane_helper_funcs for VRAM handling + * DRM_GEM_VRAM_PLANE_HELPER_FUNCS - Initializes struct drm_plane_helper_funcs + * for VRAM handling * * Drivers may use GEM BOs as VRAM helpers for the framebuffer memory. This * macro initializes struct drm_plane_helper_funcs to use the respective helper @@@ -150,8 -150,8 +150,8 @@@ void drm_gem_vram_simple_display_pipe_c struct drm_plane_state *old_state); /** - * define DRM_GEM_VRAM_DRIVER - default callback functions for \ - &struct drm_driver + * define DRM_GEM_VRAM_DRIVER - default callback functions for + * &struct drm_driver * * Drivers that use VRAM MM and GEM VRAM can use this macro to initialize * &struct drm_driver with default functions. @@@ -170,7 -170,6 +170,6 @@@ * @vram_base: Base address of the managed video memory * @vram_size: Size of the managed video memory in bytes * @bdev: The TTM BO device. - * @funcs: TTM BO functions * * The fields &struct drm_vram_mm.vram_base and * &struct drm_vram_mm.vrm_size are managed by VRAM MM, but are @@@ -185,8 -184,8 +184,8 @@@ struct drm_vram_mm }; /** - * drm_vram_mm_of_bdev() - \ - Returns the container of type &struct ttm_device for field bdev. + * drm_vram_mm_of_bdev() - Returns the container of type &struct ttm_device for + * field bdev. * @bdev: the TTM BO device * * Returns: diff --combined include/linux/fb.h index 0dd27364d56f,5e210bf72fc9..811e47f9d1c3 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@@ -145,13 -145,9 +145,13 @@@ struct fb_event void *data; }; +/* Enough for the VT console needs, see its max_font_width/height */ +#define FB_MAX_BLIT_WIDTH 64 +#define FB_MAX_BLIT_HEIGHT 128 + struct fb_blit_caps { - u32 x; - u32 y; + DECLARE_BITMAP(x, FB_MAX_BLIT_WIDTH); + DECLARE_BITMAP(y, FB_MAX_BLIT_HEIGHT); u32 len; u32 flags; }; @@@ -198,12 -194,10 +198,12 @@@ struct fb_pixmap u32 scan_align; /* alignment per scanline */ u32 access_align; /* alignment per read/write (bits) */ u32 flags; /* see FB_PIXMAP_* */ - u32 blit_x; /* supported bit block dimensions (1-32)*/ - u32 blit_y; /* Format: blit_x = 1 << (width - 1) */ - /* blit_y = 1 << (height - 1) */ - /* if 0, will be set to 0xffffffff (all)*/ + /* supported bit block dimensions */ + /* Format: test_bit(width - 1, blit_x) */ + /* test_bit(height - 1, blit_y) */ + /* if zero, will be set to full (all) */ + DECLARE_BITMAP(blit_x, FB_MAX_BLIT_WIDTH); + DECLARE_BITMAP(blit_y, FB_MAX_BLIT_HEIGHT); /* access methods */ void (*writeio)(struct fb_info *info, void __iomem *dst, void *src, unsigned int size); void (*readio) (struct fb_info *info, void *dst, void __iomem *src, unsigned int size); @@@ -693,6 -687,10 +693,10 @@@ extern int fb_deferred_io_fsync(struct #define FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(__prefix, __damage_range, __damage_area) \ __FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \ __FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys) + + #define FB_GEN_DEFAULT_DEFERRED_DMAMEM_OPS(__prefix, __damage_range, __damage_area) \ + __FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \ + __FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys) /* * Initializes struct fb_ops for deferred I/O.