]> Git Repo - linux.git/commitdiff
Merge tag 'drm-misc-next-2019-03-21' of git://anongit.freedesktop.org/drm/drm-misc...
authorDaniel Vetter <[email protected]>
Mon, 25 Mar 2019 10:05:11 +0000 (11:05 +0100)
committerDaniel Vetter <[email protected]>
Mon, 25 Mar 2019 10:05:12 +0000 (11:05 +0100)
drm-misc-next for 5.2:

UAPI Changes:
- Add Colorspace connector property (Uma)
- fourcc: Several new YUV formats from ARM (Brian & Ayan)
- fourcc: Fix merge conflicts between new formats above and Swati's that
  went in via topic/hdr-formats-2019-03-07 branch (Maarten)

Cross-subsystem Changes:
- Typed component support via topic/component-typed-2019-02-11 (Maxime/Daniel)

Core Changes:
- Improve component helper documentation (Daniel)
- Avoid calling drm_dev_unregister() twice on unplugged devices (Noralf)
- Add device managed (devm) drm_device init function (Noralf)
- Graduate TINYDRM_MODE to DRM_SIMPLE_MODE in core (Noralf)
- Move MIPI/DSI rate control params computation into core from i915 (David)
- Add support for shmem backed gem objects (Noralf)

Driver Changes:
- various: Use of_node_name_eq for node name comparisons (Rob Herring)
- sun4i: Add DSI burst mode support (Konstantin)
- panel: Add Ronbo RB070D30 MIPI/DSI panel support (Konstantin)
- virtio: A few prime improvements (Gerd)
- tinydrm: Remove tinydrm_device (Noralf)
- vc4: Add load tracker to driver to detect underflow in atomic check (Boris)
- vboxvideo: Move it out of staging \o/ (Hans)
- v3d: Add support for V3D v4.2 (Eric)

Cc: Konstantin Sudakov <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Uma Shankar <[email protected]>
Cc: Noralf Trønnes <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: David Francis <[email protected]>
Cc: Boris Brezillon <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: Hans de Goede <[email protected]>
Cc: Brian Starkey <[email protected]>
Cc: Ayan Kumar Halder <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
From: Sean Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321170805.GA50145@art_vandelay
15 files changed:
1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/driver-model/devres.txt
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
drivers/gpu/drm/arm/malidp_mw.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_atomic_uapi.c
drivers/gpu/drm/etnaviv/etnaviv_gem.h
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
drivers/gpu/drm/sun4i/sun4i_tcon.c
drivers/gpu/drm/vc4/vc4_txp.c
drivers/staging/Kconfig
drivers/staging/Makefile
include/drm/drm_connector.h

index 7db1945a95f77e215b46781e3488bed5e5004635,28febd092dc19a8743c409240930e52f1bb2dc30..5e6ea1f991d850a3e39b1588aca1aed4c0dbc4aa
@@@ -24,7 -24,6 +24,7 @@@ amarula       Amarula Solution
  amazon        Amazon.com, Inc.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  amd   Advanced Micro Devices (AMD), Inc.
 +amediatech    Shenzhen Amediatech Technology Co., Ltd
  amlogic       Amlogic, Inc.
  ampire        Ampire Co., Ltd.
  ams   AMS AG
@@@ -66,7 -65,6 +66,7 @@@ bticino Bticino Internationa
  calxeda       Calxeda
  capella       Capella Microsystems, Inc
  cascoda       Cascoda, Ltd.
 +catalyst      Catalyst Semiconductor, Inc.
  cavium        Cavium, Inc.
  cdns  Cadence Design Systems Inc.
  cdtech        CDTech(H.K.) Electronics Limited
@@@ -110,13 -108,11 +110,13 @@@ dongwoon        Dongwoon Anatec
  dptechnics    DPTechnics
  dragino       Dragino Technology Co., Limited
  ea    Embedded Artists AB
 +ebs-systart EBS-SYSTART GmbH
  ebv   EBV Elektronik
  eckelmann     Eckelmann AG
  edt   Emerging Display Technologies
  eeti  eGalax_eMPIA Technology Inc
  elan  Elan Microelectronic Corp.
 +elgin Elgin S/A.
  embest        Shenzhen Embest Technology Co., Ltd.
  emlid Emlid, Ltd.
  emmicro       EM Microelectronic
@@@ -140,13 -136,11 +140,13 @@@ fairphone       Fairphone B.V
  faraday       Faraday Technology Corporation
  fastrax       Fastrax Oy
  fcs   Fairchild Semiconductor
 +feiyang       Shenzhen Fly Young Technology Co.,LTD.
  firefly       Firefly
  focaltech     FocalTech Systems Co.,Ltd
  friendlyarm   Guangzhou FriendlyARM Computer Tech Co., Ltd
  fsl   Freescale Semiconductor
  fujitsu       Fujitsu Ltd.
 +gateworks     Gateworks Corporation
  gcw Game Consoles Worldwide
  ge    General Electric Company
  geekbuying    GeekBuying
@@@ -156,7 -150,6 +156,7 @@@ geniatech  Geniatech, Inc
  giantec       Giantec Semiconductor, Inc.
  giantplus     Giantplus Technology Co., Ltd.
  globalscale   Globalscale Technologies, Inc.
 +globaltop     GlobalTop Technology, Inc.
  gmt   Global Mixed-mode Technology, Inc.
  goodix        Shenzhen Huiding Technology Co., Ltd.
  google        Google, Inc.
@@@ -281,7 -274,6 +281,7 @@@ nintendo   Nintend
  nlt   NLT Technologies, Ltd.
  nokia Nokia
  nordic        Nordic Semiconductor
 +novtech NovTech, Inc.
  nutsboard     NutsBoard
  nuvoton       Nuvoton Technology Corporation
  nvd   New Vision Display
@@@ -302,7 -294,6 +302,7 @@@ oranth     Shenzhen Oranth Technology Co., 
  ORCL  Oracle Corporation
  orisetech     Orise Technology
  ortustech     Ortus Technology Co., Ltd.
 +osddisplays   OSD Displays
  ovti  OmniVision Technologies
  oxsemi        Oxford Semiconductor, Ltd.
  panasonic     Panasonic Corporation
@@@ -315,7 -306,6 +315,7 @@@ phytec     PHYTEC Messtechnik Gmb
  picochip      Picochip Ltd
  pine64        Pine64
  pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 +plantower Plantower Co., Ltd
  plathome      Plat'Home Co., Ltd.
  plda  PLDA
  plx   Broadcom Corporation (formerly PLX Technology)
@@@ -346,6 -336,7 +346,7 @@@ rikomagic  Rikomagic Tech Corp. Lt
  riscv RISC-V Foundation
  rockchip      Fuzhou Rockchip Electronics Co., Ltd
  rohm  ROHM Semiconductor Co., Ltd
+ ronbo   Ronbo Electronics
  roofull       Shenzhen Roofull Technology Co, Ltd
  samsung       Samsung Semiconductor
  samtec        Samtec/Softing company
@@@ -402,7 -393,6 +403,7 @@@ tcl        Toby Churchill Ltd
  technexion    TechNexion
  technologic   Technologic Systems
  tempo Tempo Semiconductor
 +techstar      Shenzhen Techstar Electronics Co., Ltd.
  terasic       Terasic Inc.
  thine THine Electronics, Inc.
  ti    Texas Instruments
@@@ -443,7 -433,6 +444,7 @@@ vot        Vision Optical Technology Co., Ltd
  wd    Western Digital Corp.
  wetek WeTek Electronics, limited.
  wexler        Wexler
 +whwave  Shenzhen whwave Electronics, Inc.
  wi2wi Wi2Wi, Inc.
  winbond Winbond Electronics corp.
  winstar       Winstar Display Corp.
index d7d6f01e81fff52ed25f0930532c5cc10875c2dc,351b7ac65a1e18b8e068eb9852104a720905bff7..99994a46135930eb85046e88ee430e5c48b7d910
@@@ -242,11 -242,9 +242,11 @@@ certainly invest a bit more effort int
  
  CLOCK
    devm_clk_get()
 +  devm_clk_get_optional()
    devm_clk_put()
    devm_clk_hw_register()
    devm_of_clk_add_hw_provider()
 +  devm_clk_hw_register_clkdev()
  
  DMA
    dmaenginem_async_device_register()
    dmam_pool_create()
    dmam_pool_destroy()
  
+ DRM
+   devm_drm_dev_init()
  GPIO
    devm_gpiod_get()
    devm_gpiod_get_index()
diff --combined MAINTAINERS
index 3e5a5d263f2992b77c4bbc884969af279513ee19,f8e63bcc4c1cbd944417835aa4a17c5069db8b28..dcf0b4f65fbe53cae073a58bdd42a401c052dd37
@@@ -331,7 -331,6 +331,7 @@@ ACPI APE
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Len Brown <[email protected]>
  L:    [email protected]
 +R:    James Morse <[email protected]>
  R:    Tony Luck <[email protected]>
  R:    Borislav Petkov <[email protected]>
  F:    drivers/acpi/apei/
@@@ -366,7 -365,6 +366,7 @@@ M: Lorenzo Pieralisi <lorenzo.pieralisi
  M:    Hanjun Guo <[email protected]>
  M:    Sudeep Holla <[email protected]>
  L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/acpi/arm64
  
@@@ -767,13 -765,6 +767,13 @@@ S:       Supporte
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
  
 +AMD FCH GPIO DRIVER
 +M:    Enrico Weigelt, metux IT consult <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-amd-fch.c
 +F:    include/linux/platform_data/gpio/gpio-amd-fch.h
 +
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  L:    [email protected] (moderated for non-subscribers)
  S:    Orphan
@@@ -862,22 -853,6 +862,22 @@@ S:       Supporte
  F:    drivers/iio/adc/ad7124.c
  F:    Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
  
 +ANALOG DEVICES INC AD7606 DRIVER
 +M:    Stefan Popa <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7606.c
 +F:    Documentation/devicetree/bindings/iio/adc/ad7606.txt
 +
 +ANALOG DEVICES INC AD7768-1 DRIVER
 +M:    Stefan Popa <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/adc/ad7768-1.c
 +F:    Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt
 +
  ANALOG DEVICES INC AD9389B DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Odd fixes
  F:    drivers/net/appletalk/
  F:    net/appletalk/
 +F:    include/linux/atalk.h
 +F:    include/uapi/linux/atalk.h
  
  APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT
 -M:    Duc Dang <dhdang@apm.com>
 +M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    arch/arm64/boot/dts/apm/
  
  APPLIED MICRO (APM) X-GENE SOC EDAC
 -M:    Loc Ho <lho@apm.com>
 +M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    drivers/edac/xgene_edac.c
  F:    Documentation/devicetree/bindings/edac/apm-xgene-edac.txt
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER
 -M:    Iyappan Subramanian <isubramanian@apm.com>
 -M:    Keyur Chudgar <kchudgar@apm.com>
 +M:    Iyappan Subramanian <i[email protected].com>
 +M:    Keyur Chudgar <k[email protected].com>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene-v2/
  
  APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
 -M:    Iyappan Subramanian <isubramanian@apm.com>
 -M:    Keyur Chudgar <kchudgar@apm.com>
 -M:    Quan Nguyen <qnguyen@apm.com>
 +M:    Iyappan Subramanian <i[email protected].com>
 +M:    Keyur Chudgar <k[email protected].com>
 +M:    Quan Nguyen <q[email protected].com>
  S:    Supported
  F:    drivers/net/ethernet/apm/xgene/
  F:    drivers/net/phy/mdio-xgene.c
@@@ -1090,7 -1063,7 +1090,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
  
  APPLIED MICRO (APM) X-GENE SOC PMU
 -M:    Tai Nguyen <ttnguyen@apm.com>
 +M:    Khuong Dinh <[email protected].com>
  S:    Supported
  F:    drivers/perf/xgene_pmu.c
  F:    Documentation/perf/xgene-pmu.txt
@@@ -1198,7 -1171,7 +1198,7 @@@ F:      arch/arm*/include/asm/hw_breakpoint.
  F:    arch/arm*/include/asm/perf_event.h
  F:    drivers/perf/*
  F:    include/linux/perf/arm_pmu.h
 -F:    Documentation/devicetree/bindings/arm/pmu.txt
 +F:    Documentation/devicetree/bindings/arm/pmu.yaml
  F:    Documentation/devicetree/bindings/perf/
  
  ARM PORT
@@@ -1411,13 -1384,6 +1411,13 @@@ F:    arch/arm/mach-aspeed
  F:    arch/arm/boot/dts/aspeed-*
  N:    aspeed
  
 +ARM/BITMAIN ARCHITECTURE
 +M:    Manivannan Sadhasivam <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/bitmain/
 +F:    Documentation/devicetree/bindings/arm/bitmain.yaml
 +
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1577,14 -1543,21 +1577,14 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
  M:    Shawn Guo <[email protected]>
  M:    Sascha Hauer <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
 -R:    Fabio Estevam <fabio.estevam@nxp.com>
 +R:    Fabio Estevam <festevam@gmail.com>
  R:    NXP Linux Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 -F:    arch/arm/mach-imx/
 -F:    arch/arm/mach-mxs/
 -F:    arch/arm/boot/dts/imx*
 -F:    arch/arm/configs/imx*_defconfig
 -F:    arch/arm64/boot/dts/freescale/imx*
 -F:    drivers/clk/imx/
 -F:    drivers/firmware/imx/
 -F:    drivers/soc/imx/
 -F:    include/linux/firmware/imx/
 -F:    include/soc/imx/
 +N:    imx
 +N:    mxs
 +X:    drivers/media/i2c/
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
@@@ -1776,7 -1749,6 +1776,7 @@@ F:      arch/arm/configs/mvebu_*_defconfi
  F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/armada-37xx-cpufreq.c
 +F:    drivers/cpufreq/armada-8k-cpufreq.c
  F:    drivers/cpufreq/mvebu-cpufreq.c
  F:    drivers/irqchip/irq-armada-370-xp.c
  F:    drivers/irqchip/irq-mvebu-*
@@@ -1922,11 -1894,10 +1922,11 @@@ F:   drivers/usb/host/ehci-w90x900.
  F:    drivers/video/fbdev/nuc900fb.c
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 -M:    Nelson Castillo <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
 -S:    Supported
 +S:    Orphan
 +F:    arch/arm/mach-s3c24xx/mach-gta02.c
 +F:    arch/arm/mach-s3c24xx/gta02.h
  
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
@@@ -1989,37 -1960,19 +1989,37 @@@ M:   David Brown <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/soc/qcom/
 +F:    Documentation/devicetree/bindings/*/qcom*
  F:    arch/arm/boot/dts/qcom-*.dts
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
 -F:    arch/arm64/boot/dts/qcom/*
 +F:    arch/arm64/boot/dts/qcom/
 +F:    drivers/*/qcom/
 +F:    drivers/*/qcom*
 +F:    drivers/*/*/qcom/
 +F:    drivers/*/*/qcom*
 +F:    drivers/*/pm8???-*
 +F:    drivers/bluetooth/btqcomsmd.c
 +F:    drivers/clocksource/timer-qcom.c
 +F:    drivers/extcon/extcon-qcom*
 +F:    drivers/iommu/msm*
  F:    drivers/i2c/busses/i2c-qup.c
 -F:    drivers/clk/qcom/
 -F:    drivers/dma/qcom/
 -F:    drivers/soc/qcom/
 +F:    drivers/i2c/busses/i2c-qcom-geni.c
 +F:    drivers/mfd/ssbi.c
 +F:    drivers/mmc/host/mmci_qcom*
 +F:    drivers/mmc/host/sdhci_msm.c
 +F:    drivers/pci/controller/dwc/pcie-qcom.c
 +F:    drivers/phy/qualcomm/
 +F:    drivers/power/*/msm*
 +F:    drivers/reset/reset-qcom-*
 +F:    drivers/scsi/ufs/ufs-qcom.*
  F:    drivers/spi/spi-qup.c
 +F:    drivers/spi/spi-geni-qcom.c
 +F:    drivers/spi/spi-qcom-qspi.c
  F:    drivers/tty/serial/msm_serial.c
 -F:    drivers/*/pm8???-*
 -F:    drivers/mfd/ssbi.c
 -F:    drivers/firmware/qcom_scm*
 +F:    drivers/usb/dwc3/dwc3-qcom.c
 +F:    include/dt-bindings/*/qcom*
 +F:    include/linux/*/qcom*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
@@@ -2056,7 -2009,7 +2056,7 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm64/boot/dts/renesas/
 -F:    Documentation/devicetree/bindings/arm/shmobile.txt
 +F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -2143,9 -2096,8 +2143,9 @@@ F:      drivers/media/platform/s5p-cec
  F:    Documentation/devicetree/bindings/media/s5p-cec.txt
  
  ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
 -M:    Andrzej Pietrasiewicz <andrzej.p@samsung.com>
 +M:    Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
  M:    Jacek Anaszewski <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -2169,8 -2121,6 +2169,8 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/gr-peach*
 +F:    arch/arm/boot/dts/iwg20d-q7*
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
  F:    arch/arm/boot/dts/r9a*
@@@ -2178,7 -2128,7 +2178,7 @@@ F:      arch/arm/boot/dts/sh
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
 -F:    Documentation/devicetree/bindings/arm/shmobile.txt
 +F:    Documentation/devicetree/bindings/arm/renesas.yaml
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  
@@@ -2565,6 -2515,7 +2565,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/devicetree/bindings/eeprom/at24.txt
  F:    drivers/misc/eeprom/at24.c
 -F:    include/linux/platform_data/at24.h
  
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <[email protected]>
@@@ -2670,7 -2621,6 +2670,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/*/include/asm/atomic*.h
  F:    include/*/atomic*.h
 +F:    scripts/atomic/
  
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
  M:    Bradley Grove <[email protected]>
  S:    Maintained
  F:    arch/powerpc/net/
  
 +BPF JIT for RISC-V (RV64G)
 +M:    Björn Töpel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/riscv/net/
 +
  BPF JIT for S390
  M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
@@@ -3204,7 -3148,6 +3204,7 @@@ F:      drivers/phy/broadcom/phy-brcm-usb
  BROADCOM GENET ETHERNET DRIVER
  M:    Doug Berger <[email protected]>
  M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/genet/
@@@ -3312,7 -3255,6 +3312,7 @@@ F:      drivers/spi/spi-iproc-qspi.
  
  BROADCOM SYSTEMPORT ETHERNET DRIVER
  M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
@@@ -3594,6 -3536,7 +3594,6 @@@ F:      include/linux/spi/cc2520.
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
 -M:    Yael Chemla <[email protected]>
  M:    Gilad Ben-Yossef <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -3757,7 -3700,7 +3757,7 @@@ CHROME HARDWARE PLATFORM SUPPOR
  M:    Benson Leung <[email protected]>
  M:    Enric Balletbo i Serra <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
  F:    drivers/platform/chrome/
  
  CHROMEOS EC SUBDRIVERS
@@@ -3769,14 -3712,6 +3769,14 @@@ N:    cros_e
  N:    cros-ec
  F:    drivers/power/supply/cros_usbpd-charger.c
  
 +CHROMEOS EC CODEC DRIVER
 +M:    Cheng-Yi Chiang <[email protected]>
 +S:    Maintained
 +R:    Enric Balletbo i Serra <[email protected]>
 +R:    Guenter Roeck <[email protected]>
 +F:    Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt
 +F:    sound/soc/codecs/cros_ec_codec.*
 +
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <[email protected]>
  M:    Paul Handrigan <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
  
 +CIRRUS LOGIC LOCHNAGAR DRIVER
 +M:    Charles Keepax <[email protected]>
 +M:    Richard Fitzgerald <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/clk/clk-lochnagar.c
 +F:    drivers/mfd/lochnagar-i2c.c
 +F:    drivers/pinctrl/cirrus/pinctrl-lochnagar.c
 +F:    drivers/regulator/lochnagar-regulator.c
 +F:    include/dt-bindings/clk/lochnagar.h
 +F:    include/dt-bindings/pinctrl/lochnagar.h
 +F:    include/linux/mfd/lochnagar*
 +F:    Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
 +F:    Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
 +
  CISCO FCOE HBA DRIVER
  M:    Satish Kharat <[email protected]>
  M:    Sesidhar Baddela <[email protected]>
@@@ -4013,10 -3931,9 +4013,10 @@@ M:    Johannes Weiner <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
 -F:    Documentation/cgroup*
 +F:    Documentation/admin-guide/cgroup-v2.rst
 +F:    Documentation/cgroup-v1/
  F:    include/linux/cgroup*
 -F:    kernel/cgroup*
 +F:    kernel/cgroup/
  
  CONTROL GROUP - CPUSET
  M:    Li Zefan <[email protected]>
@@@ -4064,7 -3981,7 +4064,7 @@@ M:      Viresh Kumar <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 -T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git (For ARM Updates)
  B:    https://bugzilla.kernel.org
  F:    Documentation/admin-guide/pm/cpufreq.rst
  F:    Documentation/admin-guide/pm/intel_pstate.rst
@@@ -4124,7 -4041,6 +4124,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  B:    https://bugzilla.kernel.org
  F:    Documentation/admin-guide/pm/cpuidle.rst
 +F:    Documentation/driver-api/pm/cpuidle.rst
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -4232,7 -4148,7 +4232,7 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
 -M:    Arjun Vynipadath <arjun@chelsio.com>
 +M:    Vishal Kulkarni <vishal@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4261,7 -4177,7 +4261,7 @@@ S:      Supporte
  F:    drivers/crypto/chelsio
  
  CXGB4 ETHERNET DRIVER (CXGB4)
 -M:    Arjun Vynipadath <arjun@chelsio.com>
 +M:    Vishal Kulkarni <vishal@chelsio.com>
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
@@@ -4645,11 -4561,10 +4645,11 @@@ S:   Maintaine
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
  FILESYSTEM DIRECT ACCESS (DAX)
 -M:    Matthew Wilcox <[email protected]>
 -M:    Ross Zwisler <zwisler@kernel.org>
 -M:    Jan Kara <[email protected]>
 +M:    Dan Williams <[email protected]>
 +R:    Matthew Wilcox <willy@infradead.org>
 +R:    Jan Kara <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    fs/dax.c
  F:    include/linux/dax.h
@@@ -4657,9 -4572,9 +4657,9 @@@ F:      include/trace/events/fs_dax.
  
  DEVICE DIRECT ACCESS (DAX)
  M:    Dan Williams <[email protected]>
 -M:    Dave Jiang <[email protected]>
 -M:    Ross Zwisler <[email protected]>
  M:    Vishal Verma <[email protected]>
 +M:    Keith Busch <[email protected]>
 +M:    Dave Jiang <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/dax/
@@@ -5045,6 -4960,13 +5045,13 @@@ S:    Odd Fixe
  F:    drivers/gpu/drm/udl/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
+ DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
+ M:    Hans de Goede <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    drivers/gpu/drm/vboxvideo/
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <[email protected]>
  R:    Haneen Mohammed <[email protected]>
@@@ -5278,7 -5200,7 +5285,7 @@@ DRM DRIVERS FOR VIVANTE GPU I
  M:    Lucas Stach <[email protected]>
  R:    Russell King <[email protected]>
  R:    Christian Gmeiner <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpu/drm/etnaviv/
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
 +EDAC-AST2500
 +M:    Stefan Schaeckeler <[email protected]>
 +S:    Supported
 +F:    drivers/edac/aspeed_edac.c
 +F:    Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
 +
  EDAC-CALXEDA
  M:    Robert Richter <[email protected]>
  L:    [email protected]
@@@ -5563,7 -5479,6 +5570,7 @@@ F:      drivers/edac/thunderx_edac
  EDAC-CORE
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
 +R:    James Morse <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@@ -5996,7 -5911,7 +6003,7 @@@ S:      Maintaine
  F:    drivers/media/tuners/fc2580*
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
 -M:    Johannes Thumshirn <[email protected]>
 +M:    Hannes Reinecke <[email protected]>
  L:    [email protected]
  W:    www.Open-FCoE.org
  S:    Supported
@@@ -6023,7 -5938,6 +6030,7 @@@ L:      [email protected]
  S:    Maintained
  F:    fs/*
  F:    include/linux/fs.h
 +F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
 +FREESCALE ENETC ETHERNET DRIVERS
 +M:    Claudiu Manoil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/freescale/enetc/
 +
  FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
  M:    Claudiu Manoil <[email protected]>
  L:    [email protected]
@@@ -6235,17 -6143,15 +6242,17 @@@ FREESCALE QORIQ PTP CLOCK DRIVE
  M:    Yangbo Lu <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    drivers/net/ethernet/freescale/enetc/enetc_ptp.c
  F:    drivers/ptp/ptp_qoriq.c
 +F:    drivers/ptp/ptp_qoriq_debugfs.c
  F:    include/linux/fsl/ptp_qoriq.h
  F:    Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
  
  FREESCALE QUAD SPI DRIVER
  M:    Han Xu <[email protected]>
 -L:    linux-[email protected].org
 +L:    linux-[email protected].org
  S:    Maintained
 -F:    drivers/mtd/spi-nor/fsl-quadspi.c
 +F:    drivers/spi/spi-fsl-qspi.c
  
  FREESCALE QUICC ENGINE LIBRARY
  M:    Qiang Zhao <[email protected]>
@@@ -6344,10 -6250,9 +6351,10 @@@ F:    include/linux/fscache*.
  FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT
  M:    Theodore Y. Ts'o <[email protected]>
  M:    Jaegeuk Kim <[email protected]>
 +M:    Eric Biggers <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-fscrypt/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git
 +T:    git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git
  S:    Supported
  F:    fs/crypto/
  F:    include/linux/fscrypt*.h
@@@ -6793,15 -6698,6 +6800,15 @@@ F:    drivers/clocksource/h8300_*.
  F:    drivers/clk/h8300/
  F:    drivers/irqchip/irq-renesas-h8*.c
  
 +HABANALABS PCI DRIVER
 +M:    Oded Gabbay <[email protected]>
 +T:    git https://github.com/HabanaAI/linux.git
 +S:    Supported
 +F:    drivers/misc/habanalabs/
 +F:    include/uapi/misc/habanalabs.h
 +F:    Documentation/ABI/testing/sysfs-driver-habanalabs
 +F:    Documentation/ABI/testing/debugfs-driver-habanalabs
 +
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -7159,7 -7055,7 +7166,7 @@@ M:      Haiyang Zhang <[email protected]
  M:    Stephen Hemminger <[email protected]>
  M:    Sasha Levin <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 -L:    devel@linuxdriverproject.org
 +L:    [email protected].org
  S:    Supported
  F:    Documentation/networking/device_drivers/microsoft/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
@@@ -7175,7 -7071,6 +7182,7 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    drivers/iommu/hyperv_iommu.c
  F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
  F:    include/uapi/linux/hyperv.h
@@@ -7325,7 -7220,6 +7332,7 @@@ F:      drivers/i2c/i2c-stub.
  I3C SUBSYSTEM
  M:    Boris Brezillon <[email protected]>
  L:    [email protected]
 +C:    irc://chat.freenode.net/linux-i3c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-i3c
@@@ -7860,6 -7754,7 +7867,6 @@@ M:      Yong Zhi <[email protected]
  M:    Sakari Ailus <[email protected]>
  M:    Bingbu Cao <[email protected]>
  R:    Tian Shu Qiu <[email protected]>
 -R:    Jian Xu Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/pci/intel/ipu3/
  S:    Maintained
  F:    drivers/gpio/gpio-intel-mid.c
  
 +INTERCONNECT API
 +M:    Georgi Djakov <[email protected]>
 +S:    Maintained
 +F:    Documentation/interconnect/
 +F:    Documentation/devicetree/bindings/interconnect/
 +F:    drivers/interconnect/
 +F:    include/dt-bindings/interconnect/
 +F:    include/linux/interconnect-provider.h
 +F:    include/linux/interconnect.h
 +
  INVENSENSE MPU-3050 GYROSCOPE DRIVER
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
@@@ -8096,16 -7981,6 +8103,16 @@@ F:    include/linux/iommu.
  F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
 +IO_URING
 +M:    Jens Axboe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.dk/linux-block
 +T:    git git://git.kernel.dk/liburing
 +S:    Maintained
 +F:    fs/io_uring.c
 +F:    include/uapi/linux/io_uring.h
 +
  IP MASQUERADING
  M:    Juanjo Ciarlante <[email protected]>
  S:    Maintained
@@@ -8471,7 -8346,6 +8478,7 @@@ F:      include/linux/kvm
  F:    include/kvm/iodev.h
  F:    virt/kvm/*
  F:    tools/kvm/
 +F:    tools/testing/selftests/kvm/
  
  KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
  M:    Joerg Roedel <[email protected]>
@@@ -8481,25 -8355,29 +8488,25 @@@ S:   Maintaine
  F:    arch/x86/include/asm/svm.h
  F:    arch/x86/kvm/svm.c
  
 -KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
 +KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
  M:    Christoffer Dall <[email protected]>
  M:    Marc Zyngier <[email protected]>
 +R:    James Morse <[email protected]>
 +R:    Julien Thierry <[email protected]>
 +R:    Suzuki K Pouloze <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
 -S:    Supported
 +S:    Maintained
  F:    arch/arm/include/uapi/asm/kvm*
  F:    arch/arm/include/asm/kvm*
  F:    arch/arm/kvm/
 -F:    virt/kvm/arm/
 -F:    include/kvm/arm_*
 -
 -KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 -M:    Christoffer Dall <[email protected]>
 -M:    Marc Zyngier <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 -S:    Maintained
  F:    arch/arm64/include/uapi/asm/kvm*
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
 +F:    virt/kvm/arm/
 +F:    include/kvm/arm_*
  
  KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  M:    James Hogan <[email protected]>
@@@ -8579,7 -8457,7 +8586,7 @@@ F:      security/keys/encrypted-keys
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
  M:      Jarkko Sakkinen <[email protected]>
 -M:    Mimi Zohar <[email protected]>
 +M:    Mimi Zohar <zohar@linux.ibm.com>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -8822,6 -8700,7 +8829,6 @@@ S:      Maintaine
  F:    tools/lib/lockdep/
  
  LIBNVDIMM BLK: MMIO-APERTURE DRIVER
 -M:    Ross Zwisler <[email protected]>
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
@@@ -8834,6 -8713,7 +8841,6 @@@ F:      drivers/nvdimm/region_devs.
  LIBNVDIMM BTT: BLOCK TRANSLATION TABLE
  M:    Vishal Verma <[email protected]>
  M:    Dan Williams <[email protected]>
 -M:    Ross Zwisler <[email protected]>
  M:    Dave Jiang <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
@@@ -8841,6 -8721,7 +8848,6 @@@ S:      Supporte
  F:    drivers/nvdimm/btt*
  
  LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVER
 -M:    Ross Zwisler <[email protected]>
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
@@@ -8859,10 -8740,9 +8866,10 @@@ F:    Documentation/devicetree/bindings/pm
  
  LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
  M:    Dan Williams <[email protected]>
 -M:    Ross Zwisler <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
 +M:    Keith Busch <[email protected]>
 +M:    Ira Weiny <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
@@@ -9010,10 -8890,10 +9017,10 @@@ F:   drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <[email protected]>
 -M:    Jessica Yu <[email protected]>
  M:    Jiri Kosina <[email protected]>
  M:    Miroslav Benes <[email protected]>
 -R:    Petr Mladek <[email protected]>
 +M:    Petr Mladek <[email protected]>
 +R:    Joe Lawrence <[email protected]>
  S:    Maintained
  F:    kernel/livepatch/
  F:    include/linux/livepatch.h
@@@ -9022,9 -8902,8 +9029,9 @@@ F:      arch/x86/kernel/livepatch.
  F:    Documentation/livepatch/
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    samples/livepatch/
 +F:    tools/testing/selftests/livepatch/
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
  
  LLC (802.2)
  L:    [email protected]
@@@ -9262,14 -9141,6 +9269,14 @@@ F:    drivers/gpu/drm/armada
  F:    include/uapi/drm/armada_drm.h
  F:    Documentation/devicetree/bindings/display/armada/
  
 +MARVELL ARMADA 3700 PHY DRIVERS
 +M:    Miquel Raynal <[email protected]>
 +S:    Maintained
 +F:    drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 +F:    drivers/phy/marvell/phy-mvebu-a3700-utmi.c
 +F:    Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
 +F:    Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt
 +
  MARVELL CRYPTO DRIVER
  M:    Boris Brezillon <[email protected]>
  M:    Arnaud Ebalard <[email protected]>
@@@ -9538,17 -9409,6 +9545,17 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/platform/imx-pxp.[ch]
  
 +MEDIA DRIVERS FOR FREESCALE IMX7
 +M:    Rui Miguel Silva <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/imx7-csi.txt
 +F:    Documentation/devicetree/bindings/media/imx7-mipi-csi2.txt
 +F:    Documentation/media/v4l-drivers/imx7.rst
 +F:    drivers/staging/media/imx/imx7-media-csi.c
 +F:    drivers/staging/media/imx/imx7-mipi-csis.c
 +
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -9910,7 -9770,6 +9917,7 @@@ M:      Vadim Pasternak <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/platform/mellanox/
 +F:    include/linux/platform_data/mlxreg.h
  
  MELLANOX MLX4 core VPI driver
  M:    Tariq Toukan <[email protected]>
@@@ -9985,14 -9844,6 +9992,14 @@@ F:    kernel/sched/membarrier.
  F:    include/uapi/linux/membarrier.h
  F:    arch/powerpc/include/asm/membarrier.h
  
 +MEMBLOCK
 +M:    Mike Rapoport <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    include/linux/memblock.h
 +F:    mm/memblock.c
 +F:    Documentation/core-api/boot-time-mm.rst
 +
  MEMORY MANAGEMENT
  L:    [email protected]
  W:    http://www.linux-mm.org
@@@ -10059,18 -9910,6 +10066,18 @@@ F:  drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
 +MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 +M:    Liang Yang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/meson_*
 +F:    Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
 +
 +METHODE UDPU SUPPORT
 +M:    Vladimir Vid <[email protected]>
 +S:    Maintained
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -10795,7 -10634,6 +10802,7 @@@ F:   Documentation/devicetree/bindings/ne
  F:    net/dsa/
  F:    include/net/dsa.h
  F:    include/linux/dsa/
 +F:    include/linux/platform_data/dsa.h
  F:    drivers/net/dsa/
  
  NETWORKING [GENERAL]
@@@ -11011,12 -10849,6 +11018,12 @@@ F: drivers/power/supply/bq27xxx_battery
  F:    drivers/power/supply/isp1704_charger.c
  F:    drivers/power/supply/rx51_battery.c
  
 +NOLIBC HEADER FILE
 +M:    Willy Tarreau <[email protected]>
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
 +F:    tools/include/nolibc/
 +
  NTB AMD DRIVER
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
@@@ -11156,14 -10988,6 +11163,14 @@@ F: lib/objagg.
  F:    lib/test_objagg.c
  F:    include/linux/objagg.h
  
 +NXP FSPI DRIVER
 +R:    Yogesh Gaur <[email protected]>
 +M:    Ashish Kumar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/spi/spi-nxp-fspi.c
 +F:    Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt
 +
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -11465,19 -11289,6 +11472,19 @@@ S: Maintaine
  F:    drivers/media/i2c/ov7740.c
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  
 +OMNIVISION OV9640 SENSOR DRIVER
 +M:    Petr Cvek <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/ov9640.*
 +
 +OMNIVISION OV8856 SENSOR DRIVER
 +M:    Ben Kao <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov8856.c
 +
  OMNIVISION OV9650 SENSOR DRIVER
  M:    Sakari Ailus <[email protected]>
  R:    Akinobu Mita <[email protected]>
@@@ -11510,11 -11321,6 +11517,11 @@@ M: Jens Wiklander <jens.wiklander@linar
  S:    Maintained
  F:    drivers/tee/optee/
  
 +OP-TEE RANDOM NUMBER GENERATOR (RNG) DRIVER
 +M:    Sumit Garg <[email protected]>
 +S:    Maintained
 +F:    drivers/char/hw_random/optee-rng.c
 +
  OPA-VNIC DRIVER
  M:    Dennis Dalessandro <[email protected]>
  M:    Niranjana Vishwanathapura <[email protected]>
@@@ -11642,6 -11448,13 +11649,6 @@@ W:  http://www.nongnu.org/orinoco
  S:    Orphan
  F:    drivers/net/wireless/intersil/orinoco/
  
 -OSD LIBRARY and FILESYSTEM
 -M:    Boaz Harrosh <[email protected]>
 -S:    Maintained
 -F:    drivers/scsi/osd/
 -F:    include/scsi/osd_*
 -F:    fs/exofs/
 -
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -11754,11 -11567,6 +11761,11 @@@ F: lib/parman.
  F:    lib/test_parman.c
  F:    include/linux/parman.h
  
 +PC ENGINES APU BOARD DRIVER
 +M:    Enrico Weigelt, metux IT consult <[email protected]>
 +S:    Maintained
 +F:    drivers/platform/x86/pcengines-apuv2.c
 +
  PC87360 HARDWARE MONITORING DRIVER
  M:    Jim Cromie <[email protected]>
  L:    [email protected]
@@@ -11812,7 -11620,7 +11819,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-altera.c
  
  PCI DRIVER FOR APPLIEDMICRO XGENE
 -M:    Tanmay Inamdar <tinamdar@apm.com>
 +M:    Toan Le <[email protected].com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11836,7 -11644,7 +11843,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR CADENCE PCIE IP
 -M:    Alan Douglas <adouglas@cadence.com>
 +M:    Tom Joseph <tjoseph@cadence.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/cdns,*.txt
@@@ -11990,7 -11798,7 +11997,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-altera-msi.c
  
  PCI MSI DRIVER FOR APPLIEDMICRO XGENE
 -M:    Duc Dang <dhdang@apm.com>
 +M:    Toan Le <[email protected].com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -12479,6 -12287,14 +12486,6 @@@ S:  Maintaine
  F:    drivers/net/ppp/pptp.c
  W:    http://sourceforge.net/projects/accel-pptp
  
 -PREEMPTIBLE KERNEL
 -M:    Robert Love <[email protected]>
 -L:    [email protected]
 -W:    https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
 -S:    Supported
 -F:    Documentation/preempt-locking.txt
 -F:    include/linux/preempt.h
 -
  PRINTK
  M:    Petr Mladek <[email protected]>
  M:    Sergey Senozhatsky <[email protected]>
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd Fixes
  F:    drivers/media/usb/pwc/*
 +F:    include/trace/events/pwc.h
  
  PWM FAN DRIVER
  M:    Kamil Debski <[email protected]>
@@@ -12841,11 -12656,11 +12848,11 @@@ F:        Documentation/media/v4l-drivers/qcom
  F:    drivers/media/platform/qcom/camss/
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 -M:  Ilia Lin <[email protected]>
 -S:  Maintained
 -F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 -F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +M:    Ilia Lin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +F:    drivers/cpufreq/qcom-cpufreq-kryo.c
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
  M:    Timur Tabi <[email protected]>
  S:    Maintained
  F:    drivers/net/ethernet/qualcomm/emac/
  
 +QUALCOMM ETHQOS ETHERNET DRIVER
 +M:    Vinod Koul <[email protected]>
 +M:    Niklas Cassel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
 +F:    Documentation/devicetree/bindings/net/qcom,dwmac.txt
 +
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:    Alok Chauhan <[email protected]>
  M:    Karthikeyan Ramasubramanian <[email protected]>
@@@ -13020,16 -12827,6 +13027,16 @@@ M: Alexandre Bounine <[email protected]
  S:    Maintained
  F:    drivers/rapidio/
  
 +RAS INFRASTRUCTURE
 +M:    Tony Luck <[email protected]>
 +M:    Borislav Petkov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ras/
 +F:    include/linux/ras.h
 +F:    include/ras/ras_event.h
 +F:    Documentation/admin-guide/ras.rst
 +
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -13227,7 -13024,6 +13234,7 @@@ F:   drivers/reset
  F:    Documentation/devicetree/bindings/reset/
  F:    include/dt-bindings/reset/
  F:    include/linux/reset.h
 +F:    include/linux/reset/
  F:    include/linux/reset-controller.h
  
  RESTARTABLE SEQUENCES SUPPORT
@@@ -13728,7 -13524,6 +13735,7 @@@ F:   kernel/sched
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
  F:    include/linux/wait.h
 +F:    include/linux/preempt.h
  
  SCR24X CHIP CARD INTERFACE DRIVER
  M:    Lubomir Rintel <[email protected]>
@@@ -13772,7 -13567,6 +13779,7 @@@ M:   "James E.J. Bottomley" <[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
  M:    "Martin K. Petersen" <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 +Q:    https://patchwork.kernel.org/project/linux-scsi/list/
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/scsi/
@@@ -13787,18 -13581,6 +13794,18 @@@ F: Documentation/scsi/st.tx
  F:    drivers/scsi/st.*
  F:    drivers/scsi/st_*.h
  
 +SCSI TARGET SUBSYSTEM
 +M:    "Martin K. Petersen" <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://www.linux-iscsi.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 +Q:    https://patchwork.kernel.org/project/target-devel/list/
 +S:    Supported
 +F:    drivers/target/
 +F:    include/target/
 +F:    Documentation/target/
 +
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
  M:    Neil Horman <[email protected]>
@@@ -13870,18 -13652,11 +13877,18 @@@ F:        drivers/mmc/host/sdhci-brcmstb
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
  L:    [email protected]
 -T:    git git://git.infradead.org/users/ahunter/linux-sdhci.git
  S:    Maintained
  F:    drivers/mmc/host/sdhci*
  F:    include/linux/mmc/sdhci*
  
 +EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
 +M:    Adrian Hunter <[email protected]>
 +M:    Ritesh Harjani <[email protected]>
 +M:    Asutosh Das <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mmc/host/cqhci*
 +
  SYNOPSYS SDHCI COMPLIANT DWC MSHC DRIVER
  M:    Prabu Thangamuthu <[email protected]>
  M:    Manjunath M B <[email protected]>
@@@ -14017,7 -13792,6 +14024,7 @@@ F:   drivers/misc/sgi-xp
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
  M:    Ursula Braun <[email protected]>
 +M:    Karsten Graul <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -14609,7 -14383,6 +14616,7 @@@ F:   arch/arm/mach-spear
  
  SPI NOR SUBSYSTEM
  M:    Marek Vasut <[email protected]>
 +M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  S:    Supported
  F:    drivers/staging/wilc1000/
  
 -STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 -M:    Arnaud Patard <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/xgifb/
 -
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
@@@ -14978,7 -14756,7 +14985,7 @@@ S:   Maintaine
  F:    drivers/tty/serial/8250/8250_dw.c
  
  SYNOPSYS DESIGNWARE APB GPIO DRIVER
 -M:    Hoan Tran <hotran@apm.com>
 +M:    Hoan Tran <ho[email protected].com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-dwapb.c
@@@ -15070,6 -14848,18 +15077,6 @@@ F:  Documentation/filesystems/sysv-fs.tx
  F:    fs/sysv/
  F:    include/linux/sysv_fs.h
  
 -TARGET SUBSYSTEM
 -M:    "Nicholas A. Bellinger" <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://www.linux-iscsi.org
 -W:    http://groups.google.com/group/linux-iscsi-target-dev
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
 -S:    Supported
 -F:    drivers/target/
 -F:    include/target/
 -F:    Documentation/target/
 -
  TASKSTATS STATISTICS INTERFACE
  M:    Balbir Singh <[email protected]>
  S:    Maintained
  S:    Maintained
  F:    sound/soc/ti/
  
 +Texas Instruments' DAC7612 DAC Driver
 +M:    Ricardo Ribalda <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/dac/ti-dac7612.c
 +F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -15674,11 -15457,12 +15681,11 @@@ F:        mm/shmem.
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <[email protected]>
  M:    Tetsuo Handa <[email protected]>
 -L:    [email protected] (subscribers-only, for developers in English)
 -L:    [email protected] (subscribers-only, for users in English)
 -L:    [email protected] (subscribers-only, for developers in Japanese)
 -L:    [email protected] (subscribers-only, for users in Japanese)
 -W:    http://tomoyo.sourceforge.jp/
 -T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
 +L:    [email protected] (subscribers-only, for developers in English)
 +L:    [email protected] (subscribers-only, for users in English)
 +L:    [email protected] (subscribers-only, for developers in Japanese)
 +L:    [email protected] (subscribers-only, for users in Japanese)
 +W:    https://tomoyo.osdn.jp/
  S:    Maintained
  F:    security/tomoyo/
  
@@@ -15967,16 -15751,14 +15974,16 @@@ F:        drivers/visorbus
  F:    drivers/staging/unisys/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 -M:    Vinayak Holikatti <[email protected]>
 +R:    Alim Akhtar <[email protected]>
 +R:    Avri Altman <[email protected]>
 +R:    Pedro Sousa <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/ufs.txt
  F:    drivers/scsi/ufs/
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 -M:    Joao Pinto <jpinto@synopsys.com>
 +M:    Pedro Sousa <pedrom.sousa@synopsys.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ufs/*dwc*
  S:    Maintained
  F:    drivers/gpio/gpio-wcove.c
  
 +WHWAVE RTC DRIVER
 +M:    Dianlong Li <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/rtc/rtc-sd3078.c
 +
  WIIMOTE HID DRIVER
  M:    David Herrmann <[email protected]>
  L:    [email protected]
@@@ -16798,11 -16574,6 +16805,11 @@@ M: David Härdeman <[email protected]
  S:    Maintained
  F:    drivers/media/rc/winbond-cir.c
  
 +RCMM REMOTE CONTROLS DECODER
 +M:    Patrick Lerda <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/ir-rcmm-decoder.c
 +
  WINSYSTEMS EBC-C384 WATCHDOG DRIVER
  M:    William Breathitt Gray <[email protected]>
  L:    [email protected]
index 2fe8397241ea4c128ed7fffc924955ac483daec8,840f3bd0fcbef83dbbd73456a604addae9745c0c..53327498efbfc590303fe47c1de5193eadc4a8ef
@@@ -742,7 -742,7 +742,7 @@@ static int gmc_v9_0_allocate_vm_inv_eng
                }
  
                ring->vm_inv_eng = inv_eng - 1;
 -              change_bit(inv_eng - 1, (unsigned long *)(&vm_inv_engs[vmhub]));
 +              vm_inv_engs[vmhub] &= ~(1 << ring->vm_inv_eng);
  
                dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",
                         ring->name, ring->vm_inv_eng, ring->funcs->vmhub);
@@@ -1011,7 -1011,7 +1011,7 @@@ static int gmc_v9_0_sw_init(void *handl
                pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32));
                printk(KERN_WARNING "amdgpu: No coherent DMA available.\n");
        }
-       adev->need_swiotlb = drm_get_max_iomem() > ((u64)1 << dma_bits);
+       adev->need_swiotlb = drm_need_swiotlb(dma_bits);
  
        if (adev->gmc.xgmi.supported) {
                r = gfxhub_v1_1_get_xgmi_info(adev);
index 87627219ce3bbf1c3983168e635a6284553e4e86,2865f7a8f0b7f1489e6b071711163c9ab01862e4..5f102bdaf84198ba9ffa9a964644f06bec502323
@@@ -141,9 -141,14 +141,14 @@@ malidp_mw_encoder_atomic_check(struct d
                return -EINVAL;
        }
  
+       if (fb->modifier) {
+               DRM_DEBUG_KMS("Writeback framebuffer does not support modifiers\n");
+               return -EINVAL;
+       }
        mw_state->format =
                malidp_hw_get_format_id(&malidp->dev->hw->map, SE_MEMWRITE,
-                                       fb->format->format);
+                                       fb->format->format, !!fb->modifier);
        if (mw_state->format == MALIDP_INVALID_FORMAT_ID) {
                struct drm_format_name_buf format_name;
  
@@@ -252,7 -257,8 +257,7 @@@ void malidp_mw_atomic_commit(struct drm
                                     &mw_state->addrs[0],
                                     mw_state->format);
  
 -              drm_writeback_queue_job(mw_conn, conn_state->writeback_job);
 -              conn_state->writeback_job = NULL;
 +              drm_writeback_queue_job(mw_conn, conn_state);
                hwdev->hw->enable_memwrite(hwdev, mw_state->addrs,
                                           mw_state->pitches, mw_state->n_planes,
                                           fb->width, fb->height, mw_state->format,
index dc8ae98071b4e2cacce1b3de735e221d709329de,2453678d11869b899483a47924a04ea6149fc0c6..86efd2da37f9cc50d890444c2519df9414019d4d
@@@ -495,7 -495,7 +495,7 @@@ mode_fixup(struct drm_atomic_state *sta
  static enum drm_mode_status mode_valid_path(struct drm_connector *connector,
                                            struct drm_encoder *encoder,
                                            struct drm_crtc *crtc,
 -                                          struct drm_display_mode *mode)
 +                                          const struct drm_display_mode *mode)
  {
        enum drm_mode_status ret;
  
@@@ -534,7 -534,7 +534,7 @@@ mode_valid(struct drm_atomic_state *sta
                struct drm_crtc *crtc = conn_state->crtc;
                struct drm_crtc_state *crtc_state;
                enum drm_mode_status mode_status;
 -              struct drm_display_mode *mode;
 +              const struct drm_display_mode *mode;
  
                if (!crtc || !encoder)
                        continue;
@@@ -1752,7 -1752,7 +1752,7 @@@ int drm_atomic_helper_commit(struct drm
         *
         * NOTE: Commit work has multiple phases, first hardware commit, then
         * cleanup. We want them to overlap, hence need system_unbound_wq to
-        * make sure work items don't artifically stall on each another.
+        * make sure work items don't artificially stall on each another.
         */
  
        drm_atomic_state_get(state);
@@@ -1786,7 -1786,7 +1786,7 @@@ EXPORT_SYMBOL(drm_atomic_helper_commit)
   *
   * Asynchronous workers need to have sufficient parallelism to be able to run
   * different atomic commits on different CRTCs in parallel. The simplest way to
-  * achive this is by running them on the &system_unbound_wq work queue. Note
+  * achieve this is by running them on the &system_unbound_wq work queue. Note
   * that drivers are not required to split up atomic commits and run an
   * individual commit in parallel - userspace is supposed to do that if it cares.
   * But it might be beneficial to do that for modesets, since those necessarily
@@@ -2261,21 -2261,10 +2261,21 @@@ EXPORT_SYMBOL(drm_atomic_helper_commit_
  int drm_atomic_helper_prepare_planes(struct drm_device *dev,
                                     struct drm_atomic_state *state)
  {
 +      struct drm_connector *connector;
 +      struct drm_connector_state *new_conn_state;
        struct drm_plane *plane;
        struct drm_plane_state *new_plane_state;
        int ret, i, j;
  
 +      for_each_new_connector_in_state(state, connector, new_conn_state, i) {
 +              if (!new_conn_state->writeback_job)
 +                      continue;
 +
 +              ret = drm_writeback_prepare_job(new_conn_state->writeback_job);
 +              if (ret < 0)
 +                      return ret;
 +      }
 +
        for_each_new_plane_in_state(state, plane, new_plane_state, i) {
                const struct drm_plane_helper_funcs *funcs;
  
@@@ -3050,31 -3039,9 +3050,31 @@@ commit
        return 0;
  }
  
 -static int __drm_atomic_helper_disable_all(struct drm_device *dev,
 -                                         struct drm_modeset_acquire_ctx *ctx,
 -                                         bool clean_old_fbs)
 +/**
 + * drm_atomic_helper_disable_all - disable all currently active outputs
 + * @dev: DRM device
 + * @ctx: lock acquisition context
 + *
 + * Loops through all connectors, finding those that aren't turned off and then
 + * turns them off by setting their DPMS mode to OFF and deactivating the CRTC
 + * that they are connected to.
 + *
 + * This is used for example in suspend/resume to disable all currently active
 + * functions when suspending. If you just want to shut down everything at e.g.
 + * driver unload, look at drm_atomic_helper_shutdown().
 + *
 + * Note that if callers haven't already acquired all modeset locks this might
 + * return -EDEADLK, which must be handled by calling drm_modeset_backoff().
 + *
 + * Returns:
 + * 0 on success or a negative error code on failure.
 + *
 + * See also:
 + * drm_atomic_helper_suspend(), drm_atomic_helper_resume() and
 + * drm_atomic_helper_shutdown().
 + */
 +int drm_atomic_helper_disable_all(struct drm_device *dev,
 +                                struct drm_modeset_acquire_ctx *ctx)
  {
        struct drm_atomic_state *state;
        struct drm_connector_state *conn_state;
@@@ -3132,6 -3099,35 +3132,6 @@@ free
        drm_atomic_state_put(state);
        return ret;
  }
 -
 -/**
 - * drm_atomic_helper_disable_all - disable all currently active outputs
 - * @dev: DRM device
 - * @ctx: lock acquisition context
 - *
 - * Loops through all connectors, finding those that aren't turned off and then
 - * turns them off by setting their DPMS mode to OFF and deactivating the CRTC
 - * that they are connected to.
 - *
 - * This is used for example in suspend/resume to disable all currently active
 - * functions when suspending. If you just want to shut down everything at e.g.
 - * driver unload, look at drm_atomic_helper_shutdown().
 - *
 - * Note that if callers haven't already acquired all modeset locks this might
 - * return -EDEADLK, which must be handled by calling drm_modeset_backoff().
 - *
 - * Returns:
 - * 0 on success or a negative error code on failure.
 - *
 - * See also:
 - * drm_atomic_helper_suspend(), drm_atomic_helper_resume() and
 - * drm_atomic_helper_shutdown().
 - */
 -int drm_atomic_helper_disable_all(struct drm_device *dev,
 -                                struct drm_modeset_acquire_ctx *ctx)
 -{
 -      return __drm_atomic_helper_disable_all(dev, ctx, false);
 -}
  EXPORT_SYMBOL(drm_atomic_helper_disable_all);
  
  /**
@@@ -3152,7 -3148,7 +3152,7 @@@ void drm_atomic_helper_shutdown(struct 
  
        DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
  
 -      ret = __drm_atomic_helper_disable_all(dev, &ctx, true);
 +      ret = drm_atomic_helper_disable_all(dev, &ctx);
        if (ret)
                DRM_ERROR("Disabling all crtc's during unload failed with %i\n", ret);
  
index 8fa77def577ff1cb2fff7c1068a7b8aab2aaa841,4eb81f10bc54fcedbbe94420c53572b3269410a5..ea797d4c82ee4b3bd2f0bf5b4772dd403708abad
@@@ -647,15 -647,28 +647,15 @@@ drm_atomic_plane_get_property(struct dr
        return 0;
  }
  
 -static struct drm_writeback_job *
 -drm_atomic_get_writeback_job(struct drm_connector_state *conn_state)
 -{
 -      WARN_ON(conn_state->connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK);
 -
 -      if (!conn_state->writeback_job)
 -              conn_state->writeback_job =
 -                      kzalloc(sizeof(*conn_state->writeback_job), GFP_KERNEL);
 -
 -      return conn_state->writeback_job;
 -}
 -
  static int drm_atomic_set_writeback_fb_for_connector(
                struct drm_connector_state *conn_state,
                struct drm_framebuffer *fb)
  {
 -      struct drm_writeback_job *job =
 -              drm_atomic_get_writeback_job(conn_state);
 -      if (!job)
 -              return -ENOMEM;
 +      int ret;
  
 -      drm_framebuffer_assign(&job->fb, fb);
 +      ret = drm_writeback_set_fb(conn_state, fb);
 +      if (ret < 0)
 +              return ret;
  
        if (fb)
                DRM_DEBUG_ATOMIC("Set [FB:%d] for connector state %p\n",
@@@ -733,6 -746,8 +733,8 @@@ static int drm_atomic_connector_set_pro
                        return -EINVAL;
                }
                state->content_protection = val;
+       } else if (property == connector->colorspace_property) {
+               state->colorspace = val;
        } else if (property == config->writeback_fb_id_property) {
                struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, NULL, val);
                int ret = drm_atomic_set_writeback_fb_for_connector(state, fb);
@@@ -801,6 -816,8 +803,8 @@@ drm_atomic_connector_get_property(struc
                *val = state->picture_aspect_ratio;
        } else if (property == config->content_type_property) {
                *val = state->content_type;
+       } else if (property == connector->colorspace_property) {
+               *val = state->colorspace;
        } else if (property == connector->scaling_mode_property) {
                *val = state->scaling_mode;
        } else if (property == connector->content_protection_property) {
@@@ -1145,17 -1162,19 +1149,17 @@@ static int prepare_signaling(struct drm
  
        for_each_new_connector_in_state(state, conn, conn_state, i) {
                struct drm_writeback_connector *wb_conn;
 -              struct drm_writeback_job *job;
                struct drm_out_fence_state *f;
                struct dma_fence *fence;
                s32 __user *fence_ptr;
  
 +              if (!conn_state->writeback_job)
 +                      continue;
 +
                fence_ptr = get_out_fence_for_connector(state, conn);
                if (!fence_ptr)
                        continue;
  
 -              job = drm_atomic_get_writeback_job(conn_state);
 -              if (!job)
 -                      return -ENOMEM;
 -
                f = krealloc(*fence_state, sizeof(**fence_state) *
                             (*num_fences + 1), GFP_KERNEL);
                if (!f)
                        return ret;
                }
  
 -              job->out_fence = fence;
 +              conn_state->writeback_job->out_fence = fence;
        }
  
        /*
index f0abb744ef9554e21772db45588859cc310c4937,7015837ccc1ca861537882aa3b33e73aa94cfc71..753c458497d0e119cd82a9959b41484be0c13582
@@@ -47,10 -47,6 +47,6 @@@ struct etnaviv_gem_object 
        struct sg_table *sgt;
        void *vaddr;
  
-       /* normally (resv == &_resv) except for imported bo's */
-       struct reservation_object *resv;
-       struct reservation_object _resv;
        struct list_head vram_list;
  
        /* cache maintenance */
@@@ -95,7 -91,6 +91,7 @@@ struct etnaviv_gem_submit_bo 
  struct etnaviv_gem_submit {
        struct drm_sched_job sched_job;
        struct kref refcount;
 +      struct etnaviv_file_private *ctx;
        struct etnaviv_gpu *gpu;
        struct dma_fence *out_fence, *in_fence;
        int out_fence_id;
index f21529e635e3d8d9ae16ffd440a425ae5a93abf0,01e7ad96339cdadd23ae1cd5d828bc794b35eb38..00e8b6a817e3e1394af06a45a309920be627f9f3
@@@ -15,7 -15,7 +15,7 @@@ struct sg_table *etnaviv_gem_prime_get_
        int npages = obj->size >> PAGE_SHIFT;
  
        if (WARN_ON(!etnaviv_obj->pages))  /* should have already pinned! */
 -              return NULL;
 +              return ERR_PTR(-EINVAL);
  
        return drm_prime_pages_to_sg(etnaviv_obj->pages, npages);
  }
@@@ -139,10 -139,3 +139,3 @@@ fail
  
        return ERR_PTR(ret);
  }
- struct reservation_object *etnaviv_gem_prime_res_obj(struct drm_gem_object *obj)
- {
-       struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
-       return etnaviv_obj->resv;
- }
index b2fe3446bfbcd35393e2203ba073fd568120a0b3,a10281e915e53fc32408dfaa6c6eac274e5628a3..e054f09ac828209467c514a13a1ef551c0d0d2c8
@@@ -108,9 -108,9 +108,9 @@@ out_unlock
  static void submit_unlock_object(struct etnaviv_gem_submit *submit, int i)
  {
        if (submit->bos[i].flags & BO_LOCKED) {
-               struct etnaviv_gem_object *etnaviv_obj = submit->bos[i].obj;
+               struct drm_gem_object *obj = &submit->bos[i].obj->base;
  
-               ww_mutex_unlock(&etnaviv_obj->resv->lock);
+               ww_mutex_unlock(&obj->resv->lock);
                submit->bos[i].flags &= ~BO_LOCKED;
        }
  }
@@@ -122,7 -122,7 +122,7 @@@ static int submit_lock_objects(struct e
  
  retry:
        for (i = 0; i < submit->nr_bos; i++) {
-               struct etnaviv_gem_object *etnaviv_obj = submit->bos[i].obj;
+               struct drm_gem_object *obj = &submit->bos[i].obj->base;
  
                if (slow_locked == i)
                        slow_locked = -1;
                contended = i;
  
                if (!(submit->bos[i].flags & BO_LOCKED)) {
-                       ret = ww_mutex_lock_interruptible(&etnaviv_obj->resv->lock,
+                       ret = ww_mutex_lock_interruptible(&obj->resv->lock,
                                                          ticket);
                        if (ret == -EALREADY)
                                DRM_ERROR("BO at index %u already on submit list\n",
@@@ -153,12 -153,12 +153,12 @@@ fail
                submit_unlock_object(submit, slow_locked);
  
        if (ret == -EDEADLK) {
-               struct etnaviv_gem_object *etnaviv_obj;
+               struct drm_gem_object *obj;
  
-               etnaviv_obj = submit->bos[contended].obj;
+               obj = &submit->bos[contended].obj->base;
  
                /* we lost out in a seqno race, lock and retry.. */
-               ret = ww_mutex_lock_slow_interruptible(&etnaviv_obj->resv->lock,
+               ret = ww_mutex_lock_slow_interruptible(&obj->resv->lock,
                                                       ticket);
                if (!ret) {
                        submit->bos[contended].flags |= BO_LOCKED;
@@@ -176,7 -176,7 +176,7 @@@ static int submit_fence_sync(struct etn
  
        for (i = 0; i < submit->nr_bos; i++) {
                struct etnaviv_gem_submit_bo *bo = &submit->bos[i];
-               struct reservation_object *robj = bo->obj->resv;
+               struct reservation_object *robj = bo->obj->base.resv;
  
                if (!(bo->flags & ETNA_SUBMIT_BO_WRITE)) {
                        ret = reservation_object_reserve_shared(robj, 1);
@@@ -207,13 -207,13 +207,13 @@@ static void submit_attach_object_fences
        int i;
  
        for (i = 0; i < submit->nr_bos; i++) {
-               struct etnaviv_gem_object *etnaviv_obj = submit->bos[i].obj;
+               struct drm_gem_object *obj = &submit->bos[i].obj->base;
  
                if (submit->bos[i].flags & ETNA_SUBMIT_BO_WRITE)
-                       reservation_object_add_excl_fence(etnaviv_obj->resv,
+                       reservation_object_add_excl_fence(obj->resv,
                                                          submit->out_fence);
                else
-                       reservation_object_add_shared_fence(etnaviv_obj->resv,
+                       reservation_object_add_shared_fence(obj->resv,
                                                            submit->out_fence);
  
                submit_unlock_object(submit, i);
@@@ -506,7 -506,7 +506,7 @@@ int etnaviv_ioctl_gem_submit(struct drm
        if (ret)
                goto err_submit_objects;
  
 -      submit->cmdbuf.ctx = file->driver_priv;
 +      submit->ctx = file->driver_priv;
        submit->exec_state = args->exec_state;
        submit->flags = args->flags;
  
index ca713d2002804fcc9d7a775f9fa97d26e0c4d26c,e75f77ff8e0fc716e84263cea1ac56c2b0b00707..fa92e992a2827b6cd5590d0096d4238ec2318ccd
@@@ -341,8 -341,8 +341,8 @@@ static void sun4i_tcon0_mode_set_cpu(st
        u32 block_space, start_delay;
        u32 tcon_div;
  
-       tcon->dclk_min_div = 4;
-       tcon->dclk_max_div = 127;
+       tcon->dclk_min_div = SUN6I_DSI_TCON_DIV;
+       tcon->dclk_max_div = SUN6I_DSI_TCON_DIV;
  
        sun4i_tcon0_mode_set_common(tcon, mode);
  
@@@ -561,10 -561,10 +561,10 @@@ static void sun4i_tcon0_mode_set_rgb(st
         * Following code is a way to avoid quirks all around TCON
         * and DOTCLOCK drivers.
         */
 -      if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE)
 +      if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
                clk_set_phase(tcon->dclk, 240);
  
 -      if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE)
 +      if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
                clk_set_phase(tcon->dclk, 0);
  
        regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG,
index 5dabd91f2d7e28b27bb82e0d9194a145661dd15a,afb1c4ec4f18fc686cebf8160e1b19332b6ba374..cc2888dd7171db9757ec6d8c2fd641a7d44e7990
@@@ -249,7 -249,6 +249,6 @@@ static int vc4_txp_connector_atomic_che
                                        struct drm_connector_state *conn_state)
  {
        struct drm_crtc_state *crtc_state;
-       struct drm_gem_cma_object *gem;
        struct drm_framebuffer *fb;
        int i;
  
        if (i == ARRAY_SIZE(drm_fmts))
                return -EINVAL;
  
-       gem = drm_fb_cma_get_gem_obj(fb, 0);
        /* Pitch must be aligned on 16 bytes. */
        if (fb->pitches[0] & GENMASK(3, 0))
                return -EINVAL;
@@@ -327,7 -324,7 +324,7 @@@ static void vc4_txp_connector_atomic_co
  
        TXP_WRITE(TXP_DST_CTRL, ctrl);
  
 -      drm_writeback_queue_job(&txp->connector, conn_state->writeback_job);
 +      drm_writeback_queue_job(&txp->connector, conn_state);
  }
  
  static const struct drm_connector_helper_funcs vc4_txp_connector_helper_funcs = {
diff --combined drivers/staging/Kconfig
index c0901b96cfe44850f6b6e580d95432b20e4a2d89,ba960e6cb62ca86de9fac94b907c4e81a96acb60..dee9e928d9dda9c10f679627eddf21a239c9f1cb
@@@ -56,6 -56,8 +56,6 @@@ source "drivers/staging/iio/Kconfig
  
  source "drivers/staging/sm750fb/Kconfig"
  
 -source "drivers/staging/xgifb/Kconfig"
 -
  source "drivers/staging/emxx_udc/Kconfig"
  
  source "drivers/staging/speakup/Kconfig"
@@@ -96,22 -98,16 +96,20 @@@ source "drivers/staging/greybus/Kconfig
  
  source "drivers/staging/vc04_services/Kconfig"
  
- source "drivers/staging/vboxvideo/Kconfig"
  source "drivers/staging/pi433/Kconfig"
  
  source "drivers/staging/mt7621-pci/Kconfig"
  
 +source "drivers/staging/mt7621-pci-phy/Kconfig"
 +
  source "drivers/staging/mt7621-pinctrl/Kconfig"
  
  source "drivers/staging/mt7621-spi/Kconfig"
  
  source "drivers/staging/mt7621-dma/Kconfig"
  
 +source "drivers/staging/ralink-gdma/Kconfig"
 +
  source "drivers/staging/mt7621-mmc/Kconfig"
  
  source "drivers/staging/mt7621-eth/Kconfig"
diff --combined drivers/staging/Makefile
index 57c6bce13ff4bff0c3487315835c2e1d6b80832e,bb25cc11fc4a34d85c2ec42033ec1b6cef4ccf33..d344078c5458e70dfedefd2a5a13eca83ceefa89
@@@ -20,6 -20,7 +20,6 @@@ obj-$(CONFIG_VT6656)          += vt6656
  obj-$(CONFIG_VME_BUS)         += vme/
  obj-$(CONFIG_IIO)             += iio/
  obj-$(CONFIG_FB_SM750)                += sm750fb/
 -obj-$(CONFIG_FB_XGI)          += xgifb/
  obj-$(CONFIG_USB_EMXX)                += emxx_udc/
  obj-$(CONFIG_SPEAKUP)         += speakup/
  obj-$(CONFIG_MFD_NVEC)                += nvec/
@@@ -38,16 -39,13 +38,15 @@@ obj-$(CONFIG_MOST)         += most
  obj-$(CONFIG_KS7010)          += ks7010/
  obj-$(CONFIG_GREYBUS)         += greybus/
  obj-$(CONFIG_BCM2835_VCHIQ)   += vc04_services/
- obj-$(CONFIG_DRM_VBOXVIDEO)   += vboxvideo/
  obj-$(CONFIG_PI433)           += pi433/
 -obj-$(CONFIG_SOC_MT7621)      += mt7621-pci/
 -obj-$(CONFIG_SOC_MT7621)      += mt7621-pinctrl/
 -obj-$(CONFIG_SOC_MT7621)      += mt7621-spi/
 +obj-$(CONFIG_PCI_MT7621)      += mt7621-pci/
 +obj-$(CONFIG_PCI_MT7621_PHY)  += mt7621-pci-phy/
 +obj-$(CONFIG_PINCTRL_RT2880)  += mt7621-pinctrl/
 +obj-$(CONFIG_SPI_MT7621)      += mt7621-spi/
  obj-$(CONFIG_SOC_MT7621)      += mt7621-dma/
 -obj-$(CONFIG_SOC_MT7621)      += mt7621-mmc/
 -obj-$(CONFIG_SOC_MT7621)      += mt7621-eth/
 +obj-$(CONFIG_DMA_RALINK)      += ralink-gdma/
 +obj-$(CONFIG_MTK_MMC)         += mt7621-mmc/
 +obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)        += mt7621-eth/
  obj-$(CONFIG_SOC_MT7621)      += mt7621-dts/
  obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)        += gasket/
  obj-$(CONFIG_XIL_AXIS_FIFO)   += axis-fifo/
index c5fbc128e86485c951cc366ef35d4cd9c37c0aee,c8061992d6cb9589c51e15aaa89ef5009a49acee..bb3bd8e1633a00ef5c1b393146c9cc19f23580ad
@@@ -253,68 -253,34 +253,96 @@@ enum drm_panel_orientation 
        DRM_MODE_PANEL_ORIENTATION_RIGHT_UP,
  };
  
+ /*
+  * This is a consolidated colorimetry list supported by HDMI and
+  * DP protocol standard. The respective connectors will register
+  * a property with the subset of this list (supported by that
+  * respective protocol). Userspace will set the colorspace through
+  * a colorspace property which will be created and exposed to
+  * userspace.
+  */
+ /* For Default case, driver will set the colorspace */
+ #define DRM_MODE_COLORIMETRY_DEFAULT                  0
+ /* CEA 861 Normal Colorimetry options */
+ #define DRM_MODE_COLORIMETRY_NO_DATA                  0
+ #define DRM_MODE_COLORIMETRY_SMPTE_170M_YCC           1
+ #define DRM_MODE_COLORIMETRY_BT709_YCC                        2
+ /* CEA 861 Extended Colorimetry Options */
+ #define DRM_MODE_COLORIMETRY_XVYCC_601                        3
+ #define DRM_MODE_COLORIMETRY_XVYCC_709                        4
+ #define DRM_MODE_COLORIMETRY_SYCC_601                 5
+ #define DRM_MODE_COLORIMETRY_OPYCC_601                        6
+ #define DRM_MODE_COLORIMETRY_OPRGB                    7
+ #define DRM_MODE_COLORIMETRY_BT2020_CYCC              8
+ #define DRM_MODE_COLORIMETRY_BT2020_RGB                       9
+ #define DRM_MODE_COLORIMETRY_BT2020_YCC                       10
+ /* Additional Colorimetry extension added as part of CTA 861.G */
+ #define DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65           11
+ #define DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER               12
 +/**
 + * enum drm_bus_flags - bus_flags info for &drm_display_info
 + *
 + * This enum defines signal polarities and clock edge information for signals on
 + * a bus as bitmask flags.
 + *
 + * The clock edge information is conveyed by two sets of symbols,
 + * DRM_BUS_FLAGS_*_DRIVE_\* and DRM_BUS_FLAGS_*_SAMPLE_\*. When this enum is
 + * used to describe a bus from the point of view of the transmitter, the
 + * \*_DRIVE_\* flags should be used. When used from the point of view of the
 + * receiver, the \*_SAMPLE_\* flags should be used. The \*_DRIVE_\* and
 + * \*_SAMPLE_\* flags alias each other, with the \*_SAMPLE_POSEDGE and
 + * \*_SAMPLE_NEGEDGE flags being equal to \*_DRIVE_NEGEDGE and \*_DRIVE_POSEDGE
 + * respectively. This simplifies code as signals are usually sampled on the
 + * opposite edge of the driving edge. Transmitters and receivers may however
 + * need to take other signal timings into account to convert between driving
 + * and sample edges.
 + *
 + * @DRM_BUS_FLAG_DE_LOW:              The Data Enable signal is active low
 + * @DRM_BUS_FLAG_DE_HIGH:             The Data Enable signal is active high
 + * @DRM_BUS_FLAG_PIXDATA_POSEDGE:     Legacy value, do not use
 + * @DRM_BUS_FLAG_PIXDATA_NEGEDGE:     Legacy value, do not use
 + * @DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE:       Data is driven on the rising edge of
 + *                                    the pixel clock
 + * @DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE:       Data is driven on the falling edge of
 + *                                    the pixel clock
 + * @DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE: Data is sampled on the rising edge of
 + *                                    the pixel clock
 + * @DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE: Data is sampled on the falling edge of
 + *                                    the pixel clock
 + * @DRM_BUS_FLAG_DATA_MSB_TO_LSB:     Data is transmitted MSB to LSB on the bus
 + * @DRM_BUS_FLAG_DATA_LSB_TO_MSB:     Data is transmitted LSB to MSB on the bus
 + * @DRM_BUS_FLAG_SYNC_POSEDGE:                Legacy value, do not use
 + * @DRM_BUS_FLAG_SYNC_NEGEDGE:                Legacy value, do not use
 + * @DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE:  Sync signals are driven on the rising
 + *                                    edge of the pixel clock
 + * @DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE:  Sync signals are driven on the falling
 + *                                    edge of the pixel clock
 + * @DRM_BUS_FLAG_SYNC_SAMPLE_POSEDGE: Sync signals are sampled on the rising
 + *                                    edge of the pixel clock
 + * @DRM_BUS_FLAG_SYNC_SAMPLE_NEGEDGE: Sync signals are sampled on the falling
 + *                                    edge of the pixel clock
 + */
 +enum drm_bus_flags {
 +      DRM_BUS_FLAG_DE_LOW = BIT(0),
 +      DRM_BUS_FLAG_DE_HIGH = BIT(1),
 +      DRM_BUS_FLAG_PIXDATA_POSEDGE = BIT(2),
 +      DRM_BUS_FLAG_PIXDATA_NEGEDGE = BIT(3),
 +      DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE = DRM_BUS_FLAG_PIXDATA_POSEDGE,
 +      DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE = DRM_BUS_FLAG_PIXDATA_NEGEDGE,
 +      DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE = DRM_BUS_FLAG_PIXDATA_NEGEDGE,
 +      DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE = DRM_BUS_FLAG_PIXDATA_POSEDGE,
 +      DRM_BUS_FLAG_DATA_MSB_TO_LSB = BIT(4),
 +      DRM_BUS_FLAG_DATA_LSB_TO_MSB = BIT(5),
 +      DRM_BUS_FLAG_SYNC_POSEDGE = BIT(6),
 +      DRM_BUS_FLAG_SYNC_NEGEDGE = BIT(7),
 +      DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE = DRM_BUS_FLAG_SYNC_POSEDGE,
 +      DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE = DRM_BUS_FLAG_SYNC_NEGEDGE,
 +      DRM_BUS_FLAG_SYNC_SAMPLE_POSEDGE = DRM_BUS_FLAG_SYNC_NEGEDGE,
 +      DRM_BUS_FLAG_SYNC_SAMPLE_NEGEDGE = DRM_BUS_FLAG_SYNC_POSEDGE,
 +};
 +
  /**
   * struct drm_display_info - runtime data about the connected sink
   *
@@@ -390,10 -356,24 +418,10 @@@ struct drm_display_info 
         */
        unsigned int num_bus_formats;
  
 -#define DRM_BUS_FLAG_DE_LOW           (1<<0)
 -#define DRM_BUS_FLAG_DE_HIGH          (1<<1)
 -/* drive data on pos. edge */
 -#define DRM_BUS_FLAG_PIXDATA_POSEDGE  (1<<2)
 -/* drive data on neg. edge */
 -#define DRM_BUS_FLAG_PIXDATA_NEGEDGE  (1<<3)
 -/* data is transmitted MSB to LSB on the bus */
 -#define DRM_BUS_FLAG_DATA_MSB_TO_LSB  (1<<4)
 -/* data is transmitted LSB to MSB on the bus */
 -#define DRM_BUS_FLAG_DATA_LSB_TO_MSB  (1<<5)
 -/* drive sync on pos. edge */
 -#define DRM_BUS_FLAG_SYNC_POSEDGE     (1<<6)
 -/* drive sync on neg. edge */
 -#define DRM_BUS_FLAG_SYNC_NEGEDGE     (1<<7)
 -
        /**
         * @bus_flags: Additional information (like pixel signal polarity) for
 -       * the pixel data on the bus, using DRM_BUS_FLAGS\_ defines.
 +       * the pixel data on the bus, using &enum drm_bus_flags values
 +       * DRM_BUS_FLAGS\_.
         */
        u32 bus_flags;
  
@@@ -550,6 -530,13 +578,13 @@@ struct drm_connector_state 
         */
        unsigned int content_protection;
  
+       /**
+        * @colorspace: State variable for Connector property to request
+        * colorspace change on Sink. This is most commonly used to switch
+        * to wider color gamuts like BT2020.
+        */
+       u32 colorspace;
        /**
         * @writeback_job: Writeback job for writeback connectors
         *
@@@ -1042,6 -1029,12 +1077,12 @@@ struct drm_connector 
         */
        struct drm_property *content_protection_property;
  
+       /**
+        * @colorspace_property: Connector property to set the suitable
+        * colorspace supported by the sink.
+        */
+       struct drm_property *colorspace_property;
        /**
         * @path_blob_ptr:
         *
@@@ -1317,6 -1310,7 +1358,7 @@@ int drm_connector_attach_vrr_capable_pr
  int drm_connector_attach_content_protection_property(
                struct drm_connector *connector);
  int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
+ int drm_mode_create_colorspace_property(struct drm_connector *connector);
  int drm_mode_create_content_type_property(struct drm_device *dev);
  void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
                                         const struct drm_connector_state *conn_state);
This page took 0.42227 seconds and 4 git commands to generate.