From: Dave Airlie <airlied@redhat.com>
Date: Wed, 29 Dec 2021 04:02:10 +0000 (+1000)
Subject: Merge tag 'drm-msm-next-2021-12-26' of ssh://gitlab.freedesktop.org/drm/msm into... 
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/2b534e90a1e31c7fc9536b512b72274cc3575f4c?hp=-c

Merge tag 'drm-msm-next-2021-12-26' of ssh://gitlab.freedesktop.org/drm/msm into drm-next

* dpu plane state cleanup in prep for multirect
* dpu debugfs cleanup (and moving things to atomic_print_state) in prep
  for multirect
* dp support for sc7280
* struct_mutex removal
* include more GMU state in gpu devcore dumps
* add support for a506
* remove old eDP sub-driver (never was used in any upstream supported
  devices and modern things with eDP will use DP sub-driver instead)
* debugfs to disable hw gpu hang detect for (igt tests)
* debugfs for dumping display hw state
* and the usual assortment of cleanup and bug fixes

There still seems to be a timing issue with dpu, showing up on sc7180
devices, after the bridge probe-order change. Ie. things work great if
loglevel is high enough (or enough debug options are enabled, etc).
We'll continue to debug this in the new year.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGs+vwr0nkwgYzuYAsCoHtypWpWav+yVvLZGsEJy8tJ56A@mail.gmail.com
---

2b534e90a1e31c7fc9536b512b72274cc3575f4c
diff --combined .mailmap
index b344067e0acb,6d6e144cc3c3..7e3fe690b86e
--- a/.mailmap
+++ b/.mailmap
@@@ -10,10 -10,12 +10,12 @@@
  # Please keep this list dictionary sorted.
  #
  Aaron Durbin <adurbin@google.com>
+ Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
  Adam Oldham <oldhamca@gmail.com>
  Adam Radford <aradford@gmail.com>
  Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
  Adrian Bunk <bunk@stusta.de>
+ Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
  Alan Cox <alan@lxorguk.ukuu.org.uk>
  Alan Cox <root@hraefn.swansea.linux.org.uk>
  Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@@ -126,8 -128,6 +128,8 @@@ Greg Kroah-Hartman <gregkh@suse.de
  Greg Kroah-Hartman <greg@kroah.com>
  Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
  Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
 +Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
 +Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
  Gustavo Padovan <gustavo@las.ic.unicamp.br>
  Gustavo Padovan <padovan@profusion.mobi>
  Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
@@@ -172,6 -172,7 +174,7 @@@ Jeff Layton <jlayton@kernel.org> <jlayt
  Jens Axboe <axboe@suse.de>
  Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
  Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
+ Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
  Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
  Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
  Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@@ -191,6 -192,7 +194,7 @@@ Juha Yrjola <at solidboot.com
  Juha Yrjola <juha.yrjola@nokia.com>
  Juha Yrjola <juha.yrjola@solidboot.com>
  Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
+ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
  Kay Sievers <kay.sievers@vrfy.org>
  Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
  Kees Cook <keescook@chromium.org> <keescook@google.com>
@@@ -202,9 -204,11 +206,11 @@@ Kenneth W Chen <kenneth.w.chen@intel.co
  Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
  Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
  Koushik <raghavendra.koushik@neterion.com>
+ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
  Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
  Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
  Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
  Leonid I Ananiev <leonid.i.ananiev@intel.com>
  Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
@@@ -311,6 -315,7 +317,7 @@@ Qais Yousef <qsyousef@gmail.com> <qais.
  Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
  Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
  Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
+ Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
  Rajesh Shah <rajesh.shah@intel.com>
  Ralf Baechle <ralf@linux-mips.org>
  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@@ -325,6 -330,7 +332,7 @@@ Rui Saraiva <rmps@joel.ist.utl.pt
  Sachin P Sant <ssant@in.ibm.com>
  Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
  Sam Ravnborg <sam@mars.ravnborg.org>
+ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
  Santosh Shilimkar <santosh.shilimkar@oracle.org>
  Santosh Shilimkar <ssantosh@kernel.org>
  Sarangdhar Joshi <spjoshi@codeaurora.org>
diff --combined MAINTAINERS
index d03ad8da1f36,540f4be2ef74..c25eb9e31df9
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -966,7 -966,6 +966,7 @@@ F:	drivers/gpu/drm/amd/include/kgd_kfd_
  F:	drivers/gpu/drm/amd/include/v9_structs.h
  F:	drivers/gpu/drm/amd/include/vi_structs.h
  F:	include/uapi/linux/kfd_ioctl.h
 +F:	include/uapi/linux/kfd_sysfs.h
  
  AMD SPI DRIVER
  M:	Sanjay R Mehta <sanju.mehta@amd.com>
@@@ -2264,15 -2263,6 +2264,15 @@@ L:	linux-iio@vger.kernel.or
  S:	Maintained
  F:	drivers/counter/microchip-tcb-capture.c
  
 +ARM/MILBEAUT ARCHITECTURE
 +M:	Taichi Sugaya <sugaya.taichi@socionext.com>
 +M:	Takao Orito <orito.takao@socionext.com>
 +L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:	Maintained
 +F:	arch/arm/boot/dts/milbeaut*
 +F:	arch/arm/mach-milbeaut/
 +N:	milbeaut
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:	Robert Jarzmik <robert.jarzmik@free.fr>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2739,11 -2729,10 +2739,11 @@@ S:	Maintaine
  F:	drivers/memory/*emif*
  
  ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 +M:	Nishanth Menon <nm@ti.com>
  M:	Santosh Shilimkar <ssantosh@kernel.org>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
  F:	arch/arm/boot/dts/keystone-*
  F:	arch/arm/mach-keystone/
  
@@@ -3581,14 -3570,13 +3581,14 @@@ L:	netdev@vger.kernel.or
  S:	Supported
  F:	drivers/net/ethernet/broadcom/b44.*
  
 -BROADCOM B53 ETHERNET SWITCH DRIVER
 +BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
  M:	Florian Fainelli <f.fainelli@gmail.com>
  L:	netdev@vger.kernel.org
  L:	openwrt-devel@lists.openwrt.org (subscribers-only)
  S:	Supported
  F:	Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
  F:	drivers/net/dsa/b53/*
 +F:	drivers/net/dsa/bcm_sf2*
  F:	include/linux/dsa/brcm.h
  F:	include/linux/platform_data/b53.h
  
@@@ -6050,6 -6038,7 +6050,7 @@@ F:	drivers/gpu/drm/tiny/mi0283qt.
  DRM DRIVER FOR MSM ADRENO GPU
  M:	Rob Clark <robdclark@gmail.com>
  M:	Sean Paul <sean@poorly.run>
+ R:	Abhinav Kumar <quic_abhinavk@quicinc.com>
  L:	linux-arm-msm@vger.kernel.org
  L:	dri-devel@lists.freedesktop.org
  L:	freedreno@lists.freedesktop.org
@@@ -6425,7 -6414,6 +6426,7 @@@ L:	dri-devel@lists.freedesktop.or
  L:	linux-renesas-soc@vger.kernel.org
  S:	Supported
  T:	git git://linuxtv.org/pinchartl/media drm/du/next
 +F:	Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml
  F:	Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
  F:	Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
  F:	Documentation/devicetree/bindings/display/renesas,du.yaml
@@@ -9346,6 -9334,7 +9347,6 @@@ S:	Maintaine
  F:	drivers/iio/pressure/dps310.c
  
  INFINIBAND SUBSYSTEM
 -M:	Doug Ledford <dledford@redhat.com>
  M:	Jason Gunthorpe <jgg@nvidia.com>
  L:	linux-rdma@vger.kernel.org
  S:	Supported
@@@ -9506,7 -9495,6 +9507,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:	Jani Nikula <jani.nikula@linux.intel.com>
  M:	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
  M:	Rodrigo Vivi <rodrigo.vivi@intel.com>
 +M:	Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
  L:	intel-gfx@lists.freedesktop.org
  S:	Supported
  W:	https://01.org/linuxgraphics/
@@@ -10297,9 -10285,9 +10298,9 @@@ F:	lib/Kconfig.kcsa
  F:	scripts/Makefile.kcsan
  
  KDUMP
 -M:	Dave Young <dyoung@redhat.com>
  M:	Baoquan He <bhe@redhat.com>
  R:	Vivek Goyal <vgoyal@redhat.com>
 +R:	Dave Young <dyoung@redhat.com>
  L:	kexec@lists.infradead.org
  S:	Maintained
  W:	http://lse.sourceforge.net/kdump/
@@@ -12197,8 -12185,8 +12198,8 @@@ F:	drivers/net/ethernet/mellanox/mlx5/c
  F:	include/linux/mlx5/mlx5_ifc_fpga.h
  
  MELLANOX ETHERNET SWITCH DRIVERS
 -M:	Jiri Pirko <jiri@nvidia.com>
  M:	Ido Schimmel <idosch@nvidia.com>
 +M:	Petr Machata <petrm@nvidia.com>
  L:	netdev@vger.kernel.org
  S:	Supported
  W:	http://www.mellanox.com
@@@ -15788,15 -15776,6 +15789,15 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/net/qcom,ethqos.txt
  F:	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
  
 +QUALCOMM FASTRPC DRIVER
 +M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 +M:	Amol Maheshwari <amahesh@qti.qualcomm.com>
 +L:	linux-arm-msm@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/misc/qcom,fastrpc.txt
 +F:	drivers/misc/fastrpc.c
 +F:	include/uapi/misc/fastrpc.h
 +
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:	Akash Asthana <akashast@codeaurora.org>
  M:	Mukesh Savaliya <msavaliy@codeaurora.org>
@@@ -16005,7 -15984,6 +16006,7 @@@ F:	arch/mips/generic/board-ranchu.
  
  RANDOM NUMBER DRIVER
  M:	"Theodore Ts'o" <tytso@mit.edu>
 +M:	Jason A. Donenfeld <Jason@zx2c4.com>
  S:	Maintained
  F:	drivers/char/random.c
  
@@@ -16528,12 -16506,6 +16529,12 @@@ T:	git git://linuxtv.org/media_tree.gi
  F:	Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
  F:	drivers/media/platform/sunxi/sun8i-rotate/
  
 +RPMSG TTY DRIVER
 +M:	Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
 +L:	linux-remoteproc@vger.kernel.org
 +S:	Maintained
 +F:	drivers/tty/rpmsg_tty.c
 +
  RTL2830 MEDIA DRIVER
  M:	Antti Palosaari <crope@iki.fi>
  L:	linux-media@vger.kernel.org
@@@ -16655,8 -16627,8 +16656,8 @@@ W:	http://www.ibm.com/developerworks/li
  F:	drivers/iommu/s390-iommu.c
  
  S390 IUCV NETWORK LAYER
 -M:	Julian Wiedmann <jwi@linux.ibm.com>
 -M:	Karsten Graul <kgraul@linux.ibm.com>
 +M:	Alexandra Winter <wintera@linux.ibm.com>
 +M:	Wenjia Zhang <wenjia@linux.ibm.com>
  L:	linux-s390@vger.kernel.org
  L:	netdev@vger.kernel.org
  S:	Supported
@@@ -16666,8 -16638,8 +16667,8 @@@ F:	include/net/iucv
  F:	net/iucv/
  
  S390 NETWORK DRIVERS
 -M:	Julian Wiedmann <jwi@linux.ibm.com>
 -M:	Karsten Graul <kgraul@linux.ibm.com>
 +M:	Alexandra Winter <wintera@linux.ibm.com>
 +M:	Wenjia Zhang <wenjia@linux.ibm.com>
  L:	linux-s390@vger.kernel.org
  L:	netdev@vger.kernel.org
  S:	Supported
@@@ -18527,7 -18499,6 +18528,7 @@@ F:	include/uapi/linux/pkt_sched.
  F:	include/uapi/linux/tc_act/
  F:	include/uapi/linux/tc_ematch/
  F:	net/sched/
 +F:	tools/testing/selftests/tc-testing
  
  TC90522 MEDIA DRIVER
  M:	Akihiro Tsukada <tskd08@gmail.com>
@@@ -19076,12 -19047,11 +19077,12 @@@ F:	drivers/mmc/host/tifm_sd.
  F:	include/linux/tifm.h
  
  TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
 +M:	Nishanth Menon <nm@ti.com>
  M:	Santosh Shilimkar <ssantosh@kernel.org>
  L:	linux-kernel@vger.kernel.org
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
 -T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
  F:	drivers/soc/ti/*
  
  TI LM49xxx FAMILY ASoC CODEC DRIVERS