Commit faa39218 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm 

Pull drm updates from Dave Airlie:
 "Highlights:

   - Core DRM had a lot of refactoring around managed drm resources to
     make drivers simpler.

   - Intel Tigerlake support is on by default

   - amdgpu now support p2p PCI buffer sharing and encrypted GPU memory

  Details:

  core:
   - uapi: error out EBUSY when existing master
   - uapi: rework SET/DROP MASTER permission handling
   - remove drm_pci.h
   - drm_pci* are now legacy
   - introduced managed DRM resources
   - subclassing support for drm_framebuffer
   - simple encoder helper
   - edid improvements
   - vblank + writeback documentation improved
   - drm/mm - optimise tree searches
   - port drivers to use devm_drm_dev_alloc

  dma-buf:
   - add flag for p2p buffer support

  mst:
   - ACT timeout improvements
   - remove drm_dp_mst_has_audio
   - don't use 2nd TX slot - spec recommends against it

  bridge:
   - dw-hdmi various improvements
   - chrontel ch7033 support
   - fix stack issues with old gcc

  hdmi:
   - add unpack function for drm infoframe

  fbdev:
   - misc fbdev driver fixes

  i915:
   - uapi: global sseu pinning
   - uapi: OA buffer polling
   - uapi: remove generated perf code
   - uapi: per-engine default property values in sysfs
   - Tigerlake GEN12 enabled.
   - Lots of gem refactoring
   - Tigerlake enablement patches
   - move to drm_device logging
   - Icelake gamma HW readout
   - push MST link retrain to hotplug work
   - bandwidth atomic helpers
   - ICL fixes
   - RPS/GT refactoring
   - Cherryview full-ppgtt support
   - i915 locking guidelines documented
   - require linear fb stride to be 512 multiple on gen9
   - Tigerlake SAGV support

  amdgpu:
   - uapi: encrypted GPU memory handling
   - uapi: add MEM_SYNC IB flag
   - p2p dma-buf support
   - export VRAM dma-bufs
   - FRU chip access support
   - RAS/SR-IOV updates
   - Powerplay locking fixes
   - VCN DPG (powergating) enablement
   - GFX10 clockgating fixes
   - DC fixes
   - GPU reset fixes
   - navi SDMA fix
   - expose FP16 for modesetting
   - DP 1.4 compliance fixes
   - gfx10 soft recovery
   - Improved Critical Thermal Faults handling
   - resizable BAR on gmc10

  amdkfd:
   - uapi: GWS resource management
   - track GPU memory per process
   - report PCI domain in topology

  radeon:
   - safe reg list generator fixes

  nouveau:
   - HD audio fixes on recent systems
   - vGPU detection (fail probe if we're on one, for now)
   - Interlaced mode fixes (mostly avoidance on Turing, which doesn't support it)
   - SVM improvements/fixes
   - NVIDIA format modifier support
   - Misc other fixes.

  adv7511:
   - HDMI SPDIF support

  ast:
   - allocate crtc state size
   - fix double assignment
   - fix suspend

  bochs:
   - drop connector register

  cirrus:
   - move to tiny drivers.

  exynos:
   - fix imported dma-buf mapping
   - enable runtime PM
   - fixes and cleanups

  mediatek:
   - DPI pin mode swap
   - config mipi_tx current/impedance

  lima:
   - devfreq + cooling device support
   - task handling improvements
   - runtime PM support

  pl111:
   - vexpress init improvements
   - fix module auto-load

  rcar-du:
   - DT bindings conversion to YAML
   - Planes zpos sanity check and fix
   - MAINTAINERS entry for LVDS panel driver

  mcde:
   - fix return value

  mgag200:
   - use managed config init

  stm:
   - read endpoints from DT

  vboxvideo:
   - use PCI managed functions
   - drop WC mtrr

  vkms:
   - enable cursor by default

  rockchip:
   - afbc support

  virtio:
   - various cleanups

  qxl:
   - fix cursor notify port

  hisilicon:
   - 128-byte stride alignment fix

  sun4i:
   - improved format handling"

* tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm: (1401 commits)
  drm/amd/display: Fix potential integer wraparound resulting in a hang
  drm/amd/display: drop cursor position check in atomic test
  drm/amdgpu: fix device attribute node create failed with multi gpu
  drm/nouveau: use correct conflicting framebuffer API
  drm/vblank: Fix -Wformat compile warnings on some arches
  drm/amdgpu: Sync with VM root BO when switching VM to CPU update mode
  drm/amd/display: Handle GPU reset for DC block
  drm/amdgpu: add apu flags (v2)
  drm/amd/powerpay: Disable gfxoff when setting manual mode on picasso and raven
  drm/amdgpu: fix pm sysfs node handling (v2)
  drm/amdgpu: move gpu_info parsing after common early init
  drm/amdgpu: move discovery gfx config fetching
  drm/nouveau/dispnv50: fix runtime pm imbalance on error
  drm/nouveau: fix runtime pm imbalance on error
  drm/nouveau: fix runtime pm imbalance on error
  drm/nouveau/debugfs: fix runtime pm imbalance on error
  drm/nouveau/nouveau/hmm: fix migrate zero page to GPU
  drm/nouveau/nouveau/hmm: fix nouveau_dmem_chunk allocations
  drm/nouveau/kms/nv50-: Share DP SST mode_valid() handling with MST
  drm/nouveau/kms/nv50-: Move 8BPC limit for MST into nv50_mstc_get_modes()
  ...
parents cfa3b806 9ca1f474

Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ examples: 
        panel@0 {

                compatible = "bananapi,lhr050h41", "ilitek,ili9881c";

                reg = <0>;

                power-gpios = <&pio 1 7 0>; /* PB07 */

                power-supply = <&reg_display>;

                reset-gpios = <&r_pio 0 5 1>; /* PL05 */

                backlight = <&pwm_bl>;

        };

Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
Analog Devices ADV7123 Video DAC

--------------------------------



The ADV7123 is a digital-to-analog converter that outputs VGA signals from a

parallel video input.



Required properties:



- compatible: Should be "adi,adv7123"



Optional properties:



- psave-gpios: Power save control GPIO



Required nodes:



The ADV7123 has two video ports. Their connections are modeled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for DPI input

- Video port 1 for VGA output





Example

-------



	adv7123: encoder@0 {

		compatible = "adi,adv7123";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				adv7123_in: endpoint@0 {

					remote-endpoint = <&dpi_out>;

				};

			};



			port@1 {

				reg = <1>;



				adv7123_out: endpoint@0 {

					remote-endpoint = <&vga_connector_in>;

				};

			};

		};

	};

Documentation/devicetree/bindings/display/bridge/anx6345.yaml

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ properties: 
    type: object



    properties:

      '#address-cells':

        const: 1



      '#size-cells':

        const: 0



      port@0:

        type: object

        description: |
@@ -51,6 +57,8 @@ properties: 
    required:

      - port@0



    additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/bridge/chrontel,ch7033.yaml

0 → 100644
+77 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2019,2020 Lubomir Rintel <lkundrak@v3.sk>

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/bridge/chrontel,ch7033.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Chrontel CH7033 Video Encoder Device Tree Bindings



maintainers:

  - Lubomir Rintel <lkundrak@v3.sk>



properties:

  compatible:

    const: chrontel,ch7033



  reg:

    maxItems: 1

    description: I2C address of the device



  ports:

    type: object



    properties:

      port@0:

        type: object

        description: |

          Video port for RGB input.



      port@1:

        type: object

        description: |

          DVI port, should be connected to a node compatible with the

          dvi-connector binding.



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

  - ports



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        vga-dvi-encoder@76 {

            compatible = "chrontel,ch7033";

            reg = <0x76>;



            ports {

                #address-cells = <1>;

                #size-cells = <0>;



                port@0 {

                    reg = <0>;

                    endpoint {

                        remote-endpoint = <&lcd0_rgb_out>;

                    };

                };



                port@1 {

                    reg = <1>;

                    endpoint {

                        remote-endpoint = <&dvi_in>;

                    };

                };



            };

        };

    };

Documentation/devicetree/bindings/display/bridge/dumb-vga-dac.txt

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
Dumb RGB to VGA DAC bridge

---------------------------



This binding is aimed for dumb RGB to VGA DAC based bridges that do not require

any configuration.



Required properties:



- compatible: Must be "dumb-vga-dac"



Required nodes:



This device has two video ports. Their connections are modelled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for RGB input

- Video port 1 for VGA output



Optional properties:

- vdd-supply: Power supply for DAC



Example

-------



bridge {

	compatible = "dumb-vga-dac";

	#address-cells = <1>;

	#size-cells = <0>;



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;



			vga_bridge_in: endpoint {

				remote-endpoint = <&tcon0_out_vga>;

			};

		};



		port@1 {

			reg = <1>;



			vga_bridge_out: endpoint {

				remote-endpoint = <&vga_con_in>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE