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

* 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 <[email protected]>
From: Rob Clark <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGs+vwr0nkwgYzuYAsCoHtypWpWav+yVvLZGsEJy8tJ56A@mail.gmail.com

diff --combined .mailmap
index b344067e0acb665b66bb7a299cba69fdf15a82fd,6d6e144cc3c3986e37eb20e0e38ba596747e4c63..7e3fe690b86e7dffbcc7cb537eaad9c34cc7f5c6
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -10,10 -10,12 +10,12 @@@
  # Please keep this list dictionary sorted.
  #
  Aaron Durbin <[email protected]>
+ Abhinav Kumar <[email protected]> <[email protected]>
  Adam Oldham <[email protected]>
  Adam Radford <[email protected]>
  Adriana Reus <[email protected]> <[email protected]>
  Adrian Bunk <[email protected]>
+ Akhil P Oommen <[email protected]> <[email protected]>
  Alan Cox <[email protected]>
  Alan Cox <[email protected]>
  Aleksandar Markovic <[email protected]> <[email protected]>
@@@ -126,8 -128,6 +128,8 @@@ Greg Kroah-Hartman <[email protected]
  Greg Kroah-Hartman <[email protected]>
  Greg Kurz <[email protected]> <[email protected]>
  Gregory CLEMENT <[email protected]> <[email protected]>
 +Guo Ren <[email protected]> <[email protected]>
 +Guo Ren <[email protected]> <[email protected]>
  Gustavo Padovan <[email protected]>
  Gustavo Padovan <[email protected]>
  Hanjun Guo <[email protected]> <[email protected]>
@@@ -172,6 -172,7 +174,7 @@@ Jeff Layton <[email protected]> <jlayt
  Jens Axboe <[email protected]>
  Jens Osterkamp <[email protected]>
  Jernej Skrabec <[email protected]> <[email protected]>
+ Jessica Zhang <[email protected]> <[email protected]>
  Jiri Slaby <[email protected]> <[email protected]>
  Jiri Slaby <[email protected]> <[email protected]>
  Jiri Slaby <[email protected]> <[email protected]>
@@@ -191,6 -192,7 +194,7 @@@ Juha Yrjola <at solidboot.com
  Juha Yrjola <[email protected]>
  Juha Yrjola <[email protected]>
  Julien Thierry <[email protected]> <[email protected]>
+ Kalyan Thota <[email protected]> <[email protected]>
  Kay Sievers <[email protected]>
  Kees Cook <[email protected]> <[email protected]>
  Kees Cook <[email protected]> <[email protected]>
@@@ -202,9 -204,11 +206,11 @@@ Kenneth W Chen <[email protected]
  Konstantin Khlebnikov <[email protected]> <[email protected]>
  Konstantin Khlebnikov <[email protected]> <[email protected]>
  Koushik <[email protected]>
+ Krishna Manikandan <[email protected]> <[email protected]>
  Krzysztof Kozlowski <[email protected]> <[email protected]>
  Krzysztof Kozlowski <[email protected]> <[email protected]>
  Kuninori Morimoto <[email protected]>
+ Kuogee Hsieh <[email protected]> <[email protected]>
  Leonardo Bras <[email protected]> <[email protected]>
  Leonid I Ananiev <[email protected]>
  Leon Romanovsky <[email protected]> <[email protected]>
@@@ -311,6 -315,7 +317,7 @@@ Qais Yousef <[email protected]> <qais.
  Quentin Monnet <[email protected]> <[email protected]>
  Quentin Perret <[email protected]> <[email protected]>
  Rafael J. Wysocki <[email protected]> <[email protected]>
+ Rajeev Nandan <[email protected]> <[email protected]>
  Rajesh Shah <[email protected]>
  Ralf Baechle <[email protected]>
  Ralf Wildenhues <[email protected]>
@@@ -325,6 -330,7 +332,7 @@@ Rui Saraiva <[email protected]
  Sachin P Sant <[email protected]>
  Sakari Ailus <[email protected]> <[email protected]>
  Sam Ravnborg <[email protected]>
+ Sankeerth Billakanti <[email protected]> <[email protected]>
  Santosh Shilimkar <[email protected]>
  Santosh Shilimkar <[email protected]>
  Sarangdhar Joshi <[email protected]>

diff --combined MAINTAINERS
index d03ad8da1f368244aa5a2ff1aa8f35673caf6b6e,540f4be2ef74765e698682b07c250232c62dfafa..c25eb9e31df9d4d10f53b426c9e785b45dd38829
--- 1/MAINTAINERS
--- 2/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 <[email protected]>
@@@ -2264,15 -2263,6 +2264,15 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/counter/microchip-tcb-capture.c
  
 +ARM/MILBEAUT ARCHITECTURE
 +M:    Taichi Sugaya <[email protected]>
 +M:    Takao Orito <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2739,11 -2729,10 +2739,11 @@@ S:   Maintaine
  F:    drivers/memory/*emif*
  
  ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 +M:    Nishanth Menon <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected] (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:   [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/b44.*
  
 -BROADCOM B53 ETHERNET SWITCH DRIVER
 +BROADCOM B53/SF2 ETHERNET SWITCH DRIVER
  M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  L:    [email protected] (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 <[email protected]>
  M:    Sean Paul <[email protected]>
+ R:    Abhinav Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -6425,7 -6414,6 +6426,7 @@@ L:      [email protected]
  L:    [email protected]
  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 <[email protected]>
  M:    Jason Gunthorpe <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9506,7 -9495,6 +9507,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Jani Nikula <[email protected]>
  M:    Joonas Lahtinen <[email protected]>
  M:    Rodrigo Vivi <[email protected]>
 +M:    Tvrtko Ursulin <[email protected]>
  L:    [email protected]
  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 <[email protected]>
  M:    Baoquan He <[email protected]>
  R:    Vivek Goyal <[email protected]>
 +R:    Dave Young <[email protected]>
  L:    [email protected]
  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 <[email protected]>
  M:    Ido Schimmel <[email protected]>
 +M:    Petr Machata <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +M:    Amol Maheshwari <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Mukesh Savaliya <[email protected]>
@@@ -16005,7 -15984,6 +16006,7 @@@ F:   arch/mips/generic/board-ranchu.
  
  RANDOM NUMBER DRIVER
  M:    "Theodore Ts'o" <[email protected]>
 +M:    Jason A. Donenfeld <[email protected]>
  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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/tty/rpmsg_tty.c
 +
  RTL2830 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -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:    [email protected]
  L:    [email protected]
  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:    [email protected]
  L:    [email protected]
  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 <[email protected]>
@@@ -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 <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
  L:    [email protected]
  L:    [email protected] (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