Merge tag 'drm-misc-next-2023-12-14' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for $kernel-version:

UAPI Changes:

Cross-subsystem Changes:
 - A few fixes for usb/typec

Core Changes:
 - ci: Updates to the defconfig, igt version, etc.
 - writeback: Move the atomic_check helper from the encoder to connector

Driver Changes:
 - rockchip: Add support for rk3588
 - xe: Update the TODO list
 - panel:
   - nv3052c: Register documentation, init sequence improvements and
     support for the Fascontek FS035VG158
   - st7701: Add support for the Anbernic RG-ARC
   - new driver: Synaptics R63353 panel controller, Ilitek ILI9805 panel
     controller
   - new panel: AUO G156HAN04.0

Signed-off-by: Dave Airlie <[email protected]>
From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/aqpn5miejmkks7pbcfex7b6u63uwsruywxsnr3x5ljs45qatin@nbkkej2elk46

diff --combined MAINTAINERS
index c1a2cac80f50380043fa7101e67fc49609e3e8ce,f2cee321099fb1efd13459353f6f19166c03d1e7..7f47f12d6f924f565e30afc9d9654ddef6232e13
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -171,10 -171,13 +171,10 @@@ S:      Supporte
  F:    drivers/soc/fujitsu/a64fx-diag.c
  
  A8293 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/a8293*
  
  AACRAID SCSI RAID DRIVER
@@@ -573,17 -576,23 +573,17 @@@ F:      drivers/iio/accel/adxl372_i2c.
  F:    drivers/iio/accel/adxl372_spi.c
  
  AF9013 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/af9013*
  
  AF9033 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/af9033*
  
  AFFS FILE SYSTEM
@@@ -641,10 -650,13 +641,10 @@@ F:      fs/aio.
  F:    include/linux/*aio*.h
  
  AIRSPY MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/airspy/
  
  ALACRITECH GIGABIT ETHERNET DRIVER
@@@ -2143,7 -2155,6 +2143,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  F:    arch/arm/boot/dts/nxp/imx/
  F:    arch/arm/boot/dts/nxp/mxs/
 +F:    arch/arm64/boot/dts/freescale/
  X:    arch/arm64/boot/dts/freescale/fsl-*
  X:    arch/arm64/boot/dts/freescale/qoriq-*
  X:    drivers/media/i2c/
@@@ -2524,7 -2535,7 +2524,7 @@@ F:      drivers/*/*/*wpcm
  F:    drivers/*/*wpcm*
  
  ARM/NXP S32G ARCHITECTURE
 -M:    Chester Lin <clin@suse.com>
 +M:    Chester Lin <chester62515@gmail.com>
  R:    Andreas Färber <[email protected]>
  R:    Matthias Brugger <[email protected]>
  R:    NXP S32 Linux Team <[email protected]>
@@@ -5065,6 -5076,7 +5065,6 @@@ CLANG CONTROL FLOW INTEGRITY SUPPOR
  M:    Sami Tolvanen <[email protected]>
  M:    Kees Cook <[email protected]>
  R:    Nathan Chancellor <[email protected]>
 -R:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    https://github.com/ClangBuiltLinux/linux/issues
@@@ -5079,9 -5091,8 +5079,9 @@@ F:      .clang-forma
  
  CLANG/LLVM BUILD SUPPORT
  M:    Nathan Chancellor <[email protected]>
 -M:    Nick Desaulniers <[email protected]>
 -R:    Tom Rix <[email protected]>
 +R:    Nick Desaulniers <[email protected]>
 +R:    Bill Wendling <[email protected]>
 +R:    Justin Stitt <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
@@@ -5231,6 -5242,7 +5231,6 @@@ F:      drivers/platform/x86/compal-laptop.
  
  COMPILER ATTRIBUTES
  M:    Miguel Ojeda <[email protected]>
 -R:    Nick Desaulniers <[email protected]>
  S:    Maintained
  F:    include/linux/compiler_attributes.h
  
@@@ -5593,10 -5605,13 +5593,10 @@@ F:   Documentation/driver-api/media/drive
  F:    drivers/media/pci/cx88/
  
  CXD2820R MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
@@@ -5709,10 -5724,13 +5709,10 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/input/keyboard/cypress-sf.c
  
  CYPRESS_FIRMWARE MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/common/cypress_firmware*
  
  CYTTSP TOUCHSCREEN DRIVER
@@@ -6627,6 -6645,12 +6627,12 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/ilitek,ili9486.yaml
  F:    drivers/gpu/drm/tiny/ili9486.c
  
+ DRM DRIVER FOR ILITEK ILI9805 PANELS
+ M:    Michael Trimarchi <[email protected]>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/panel/ilitek,ili9805.yaml
+ F:    drivers/gpu/drm/panel/panel-ilitek-ili9805.c
+ 
  DRM DRIVER FOR JADARD JD9365DA-H3 MIPI-DSI LCD PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -6855,6 -6879,12 +6861,12 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/ste,mcde.yaml
  F:    drivers/gpu/drm/mcde/
  
+ DRM DRIVER FOR SYNAPTICS R63353 PANELS
+ M:    Michael Trimarchi <[email protected]>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/panel/synaptics,r63353.yaml
+ F:    drivers/gpu/drm/panel/panel-synaptics-r63353.c
+ 
  DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE
  M:    Jagan Teki <[email protected]>
  S:    Maintained
@@@ -7139,6 -7169,7 +7151,7 @@@ F:      include/linux/platform_data/shmob_dr
  DRM DRIVERS FOR ROCKCHIP
  M:    Sandy Huang <[email protected]>
  M:    Heiko Stübner <[email protected]>
+ M:    Andy Yan <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7299,38 -7330,53 +7312,38 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/pci/dt3155/
  
  DVB_USB_AF9015 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/af9015*
  
  DVB_USB_AF9035 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/af9035*
  
  DVB_USB_ANYSEE MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/anysee*
  
  DVB_USB_AU6610 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/au6610*
  
  DVB_USB_CE6230 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/ce6230*
  
  DVB_USB_CXUSB MEDIA DRIVER
@@@ -7344,17 -7390,22 +7357,17 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/dvb-usb/cxusb*
  
  DVB_USB_EC168 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/ec168*
  
  DVB_USB_GL861 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/gl861*
  
  DVB_USB_MXL111SF MEDIA DRIVER
@@@ -7368,18 -7419,23 +7381,18 @@@ T:   git git://linuxtv.org/mkrufky/mxl111
  F:    drivers/media/usb/dvb-usb-v2/mxl111sf*
  
  DVB_USB_RTL28XXU MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/rtl28xxu*
  
  DVB_USB_V2 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
  W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/dvb_usb*
  F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
  
@@@ -7421,10 -7477,13 +7434,10 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/input/misc/e3x0-button.c
  
  E4000 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/e4000*
  
  EARTH_PT1 MEDIA DRIVER
@@@ -7440,10 -7499,13 +7453,10 @@@ S:   Odd Fixe
  F:    drivers/media/pci/pt3/
  
  EC100 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/ec100*
  
  ECRYPT FILE SYSTEM
@@@ -8061,10 -8123,13 +8074,10 @@@ F:   drivers/media/tuners/fc0011.
  F:    drivers/media/tuners/fc0011.h
  
  FC2580 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/fc2580*
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
@@@ -9194,10 -9259,13 +9207,10 @@@ F:   include/trace/events/habanalabs.
  F:    include/uapi/drm/habanalabs_accel.h
  
  HACKRF MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/hackrf/
  
  HANDSHAKE UPCALL FOR TRANSPORT LAYER SECURITY
@@@ -9570,7 -9638,6 +9583,7 @@@ F:      drivers/crypto/hisilicon/sgl.
  F:    include/linux/hisi_acc_qm.h
  
  HISILICON ROCE DRIVER
 +M:    Chengchang Tang <[email protected]>
  M:    Junxian Huang <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -11282,10 -11349,13 +11295,10 @@@ F:        Documentation/hwmon/it87.rs
  F:    drivers/hwmon/it87.c
  
  IT913X MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/it913x*
  
  ITE IT66121 HDMI BRIDGE DRIVER
@@@ -11467,6 -11537,7 +11480,6 @@@ F:   fs/autofs
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Masahiro Yamada <[email protected]>
  R:    Nathan Chancellor <[email protected]>
 -R:    Nick Desaulniers <[email protected]>
  R:    Nicolas Schier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -12158,13 -12229,6 +12171,13 @@@ F: include/linux/nd.
  F:    include/uapi/linux/ndctl.h
  F:    tools/testing/nvdimm/
  
 +LIBRARY CODE
 +M:    Andrew Morton <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-nonmm-unstable
 +F:    lib/*
 +
  LICENSES and SPDX stuff
  M:    Thomas Gleixner <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -12644,10 -12708,13 +12657,10 @@@ W:        http://www.tazenda.demon.co.uk/phil/
  F:    arch/m68k/hp300/
  
  M88DS3103 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/m88ds3103*
  
  M88RS2000 MEDIA DRIVER
@@@ -14541,16 -14608,20 +14554,16 @@@ F:        include/asm-generic/tlb.
  F:    mm/mmu_gather.c
  
  MN88472 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/dvb-frontends/mn88472*
  
  MN88473 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/dvb-frontends/mn88473*
  
@@@ -14638,17 -14709,23 +14651,17 @@@ S:        Orpha
  F:    drivers/platform/x86/msi-wmi.c
  
  MSI001 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/msi001*
  
  MSI2500 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/msi2500/
  
  MSTAR INTERRUPT CONTROLLER DRIVER
@@@ -15012,7 -15089,6 +15025,7 @@@ F:   lib/random32.
  F:    net/
  F:    tools/net/
  F:    tools/testing/selftests/net/
 +X:    net/9p/
  X:    net/bluetooth/
  
  NETWORKING [IPSEC]
@@@ -17720,10 -17796,13 +17733,10 @@@ F:        drivers/bus/fsl-mc
  F:    include/uapi/linux/fsl_mc.h
  
  QT1010 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATH12K WIRELESS DRIVER
@@@ -17890,8 -17969,6 +17903,8 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
 +F:    drivers/iommu/arm/arm-smmu/arm-smmu-qcom*
 +F:    drivers/iommu/msm_iommu*
  
  QUALCOMM IPC ROUTER (QRTR) DRIVER
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -18778,24 -18855,33 +18791,24 @@@ S:        Maintaine
  F:    drivers/tty/rpmsg_tty.c
  
  RTL2830 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/rtl2830*
  
  RTL2832 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/rtl2832*
  
  RTL2832_SDR MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/rtl2832_sdr*
  
  RTL8180 WIRELESS DRIVER
@@@ -19605,10 -19691,13 +19618,10 @@@ F:        drivers/media/platform/renesas/sh_vo
  F:    include/media/drv-intf/sh_vou.h
  
  SI2157 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/si2157*
  
  SI2165 MEDIA DRIVER
@@@ -19620,10 -19709,13 +19633,10 @@@ Q:        http://patchwork.linuxtv.org/project
  F:    drivers/media/dvb-frontends/si2165*
  
  SI2168 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/si2168*
  
  SI470X FM RADIO RECEIVER I2C DRIVER
@@@ -21125,24 -21217,33 +21138,24 @@@ W:        http://tcp-lp-mod.sourceforge.net
  F:    net/ipv4/tcp_lp.c
  
  TDA10071 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/tda10071*
  
  TDA18212 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/tda18212*
  
  TDA18218 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/tda18218*
  
  TDA18250 MEDIA DRIVER
@@@ -22078,10 -22179,13 +22091,10 @@@ F:        include/uapi/linux/serial_core.
  F:    include/uapi/linux/tty.h
  
  TUA9001 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/tua9001*
  
  TULIP NETWORK DRIVERS
@@@ -24026,16 -24130,20 +24039,16 @@@ S:        Orpha
  F:    drivers/net/wireless/zydas/zd1211rw/
  
  ZD1301 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org/
 -W:    http://palosaari.fi/linux/
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/usb/dvb-usb-v2/zd1301*
  
  ZD1301_DEMOD MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org/
 -W:    http://palosaari.fi/linux/
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/dvb-frontends/zd1301_demod*
  

diff --combined drivers/gpu/drm/drm_atomic_helper.c
index a920fbae714c8ed2d3d034b3c915bbd155ce8d94,c98a766ca3bd7deb7f17f90692a1db173d0c0ac8..39ef0a6addeba8ca815e7f9bdd6436c6df751902
--- 1/drivers/gpu/drm/drm_atomic_helper.c
--- 2/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@@ -795,9 -795,9 +795,9 @@@ drm_atomic_helper_check_modeset(struct 
  EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
  
  /**
-  * drm_atomic_helper_check_wb_encoder_state() - Check writeback encoder state
-  * @encoder: encoder state to check
-  * @conn_state: connector state to check
+  * drm_atomic_helper_check_wb_connector_state() - Check writeback connector state
+  * @connector: corresponding connector
+  * @state: the driver state object
   *
   * Checks if the writeback connector state is valid, and returns an error if it
   * isn't.
@@@ -806,9 -806,11 +806,11 @@@
   * Zero for success or -errno
   */
  int
- drm_atomic_helper_check_wb_encoder_state(struct drm_encoder *encoder,
-                                        struct drm_connector_state *conn_state)
+ drm_atomic_helper_check_wb_connector_state(struct drm_connector *connector,
+                                          struct drm_atomic_state *state)
  {
+       struct drm_connector_state *conn_state =
+               drm_atomic_get_new_connector_state(state, connector);
        struct drm_writeback_job *wb_job = conn_state->writeback_job;
        struct drm_property_blob *pixel_format_blob;
        struct drm_framebuffer *fb;
@@@ -827,11 -829,11 +829,11 @@@
                if (fb->format->format == formats[i])
                        return 0;
  
-       drm_dbg_kms(encoder->dev, "Invalid pixel format %p4cc\n", &fb->format->format);
+       drm_dbg_kms(connector->dev, "Invalid pixel format %p4cc\n", &fb->format->format);
  
        return -EINVAL;
  }
- EXPORT_SYMBOL(drm_atomic_helper_check_wb_encoder_state);
+ EXPORT_SYMBOL(drm_atomic_helper_check_wb_connector_state);
  
  /**
   * drm_atomic_helper_check_plane_state() - Check plane state for validity
@@@ -2012,7 -2014,7 +2014,7 @@@ int drm_atomic_helper_commit(struct drm
                        return ret;
  
                drm_atomic_helper_async_commit(dev, state);
 -              drm_atomic_helper_cleanup_planes(dev, state);
 +              drm_atomic_helper_unprepare_planes(dev, state);
  
                return 0;
        }
@@@ -2072,7 -2074,7 +2074,7 @@@
        return 0;
  
  err:
 -      drm_atomic_helper_cleanup_planes(dev, state);
 +      drm_atomic_helper_unprepare_planes(dev, state);
        return ret;
  }
  EXPORT_SYMBOL(drm_atomic_helper_commit);
@@@ -2650,39 -2652,6 +2652,39 @@@ fail_prepare_fb
  }
  EXPORT_SYMBOL(drm_atomic_helper_prepare_planes);
  
 +/**
 + * drm_atomic_helper_unprepare_planes - release plane resources on aborts
 + * @dev: DRM device
 + * @state: atomic state object with old state structures
 + *
 + * This function cleans up plane state, specifically framebuffers, from the
 + * atomic state. It undoes the effects of drm_atomic_helper_prepare_planes()
 + * when aborting an atomic commit. For cleaning up after a successful commit
 + * use drm_atomic_helper_cleanup_planes().
 + */
 +void drm_atomic_helper_unprepare_planes(struct drm_device *dev,
 +                                      struct drm_atomic_state *state)
 +{
 +      struct drm_plane *plane;
 +      struct drm_plane_state *new_plane_state;
 +      int i;
 +
 +      for_each_new_plane_in_state(state, plane, new_plane_state, i) {
 +              const struct drm_plane_helper_funcs *funcs = plane->helper_private;
 +
 +              if (funcs->end_fb_access)
 +                      funcs->end_fb_access(plane, new_plane_state);
 +      }
 +
 +      for_each_new_plane_in_state(state, plane, new_plane_state, i) {
 +              const struct drm_plane_helper_funcs *funcs = plane->helper_private;
 +
 +              if (funcs->cleanup_fb)
 +                      funcs->cleanup_fb(plane, new_plane_state);
 +      }
 +}
 +EXPORT_SYMBOL(drm_atomic_helper_unprepare_planes);
 +
  static bool plane_crtc_active(const struct drm_plane_state *state)
  {
        return state->crtc && state->crtc->state->active;
@@@ -2817,17 -2786,6 +2819,17 @@@ void drm_atomic_helper_commit_planes(st
  
                funcs->atomic_flush(crtc, old_state);
        }
 +
 +      /*
 +       * Signal end of framebuffer access here before hw_done. After hw_done,
 +       * a later commit might have already released the plane state.
 +       */
 +      for_each_old_plane_in_state(old_state, plane, old_plane_state, i) {
 +              const struct drm_plane_helper_funcs *funcs = plane->helper_private;
 +
 +              if (funcs->end_fb_access)
 +                      funcs->end_fb_access(plane, old_plane_state);
 +      }
  }
  EXPORT_SYMBOL(drm_atomic_helper_commit_planes);
  
@@@ -2955,22 -2913,40 +2957,22 @@@ EXPORT_SYMBOL(drm_atomic_helper_disable
   * configuration. Hence the old configuration must be perserved in @old_state to
   * be able to call this function.
   *
 - * This function must also be called on the new state when the atomic update
 - * fails at any point after calling drm_atomic_helper_prepare_planes().
 + * This function may not be called on the new state when the atomic update
 + * fails at any point after calling drm_atomic_helper_prepare_planes(). Use
 + * drm_atomic_helper_unprepare_planes() in this case.
   */
  void drm_atomic_helper_cleanup_planes(struct drm_device *dev,
                                      struct drm_atomic_state *old_state)
  {
        struct drm_plane *plane;
 -      struct drm_plane_state *old_plane_state, *new_plane_state;
 +      struct drm_plane_state *old_plane_state;
        int i;
  
 -      for_each_oldnew_plane_in_state(old_state, plane, old_plane_state, new_plane_state, i) {
 +      for_each_old_plane_in_state(old_state, plane, old_plane_state, i) {
                const struct drm_plane_helper_funcs *funcs = plane->helper_private;
  
 -              if (funcs->end_fb_access)
 -                      funcs->end_fb_access(plane, new_plane_state);
 -      }
 -
 -      for_each_oldnew_plane_in_state(old_state, plane, old_plane_state, new_plane_state, i) {
 -              const struct drm_plane_helper_funcs *funcs;
 -              struct drm_plane_state *plane_state;
 -
 -              /*
 -               * This might be called before swapping when commit is aborted,
 -               * in which case we have to cleanup the new state.
 -               */
 -              if (old_plane_state == plane->state)
 -                      plane_state = new_plane_state;
 -              else
 -                      plane_state = old_plane_state;
 -
 -              funcs = plane->helper_private;
 -
                if (funcs->cleanup_fb)
 -                      funcs->cleanup_fb(plane, plane_state);
 +                      funcs->cleanup_fb(plane, old_plane_state);
        }
  }
  EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);

diff --combined include/drm/drm_atomic_helper.h
index 006b5c977ad7725f880f35a057bbc7dc9ef22fc6,fea528aacfe27c47cb3d662977403b3e60945189..9aa0a05aa072f14aeb57b4dd8e6674c14190b59a
--- 1/include/drm/drm_atomic_helper.h
--- 2/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@@ -49,9 -49,8 +49,8 @@@ struct drm_private_state
  
  int drm_atomic_helper_check_modeset(struct drm_device *dev,
                                struct drm_atomic_state *state);
- int
- drm_atomic_helper_check_wb_encoder_state(struct drm_encoder *encoder,
-                                        struct drm_connector_state *conn_state);
+ int drm_atomic_helper_check_wb_connector_state(struct drm_connector *connector,
+                                              struct drm_atomic_state *state);
  int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
                                        const struct drm_crtc_state *crtc_state,
                                        int min_scale,
@@@ -97,8 -96,6 +96,8 @@@ void drm_atomic_helper_commit_modeset_e
  
  int drm_atomic_helper_prepare_planes(struct drm_device *dev,
                                     struct drm_atomic_state *state);
 +void drm_atomic_helper_unprepare_planes(struct drm_device *dev,
 +                                      struct drm_atomic_state *state);
  
  #define DRM_PLANE_COMMIT_ACTIVE_ONLY                  BIT(0)
  #define DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET     BIT(1)