Commit 0a19b068 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-next for v5.9:

UAPI Changes:
- Add DRM_MODE_TYPE_USERDEF for video modes specified in cmdline.

Cross-subsystem Changes:
- Assorted devicetree binding updates.
- Add might_sleep() to dma_fence_wait().
- Fix fbdev's get_user_pages_fast() handling, and use pin_user_pages.
- Small cleanup with IS_BUILTIN in video/fbdev drivers.
- Fix video/hdmi coding style for infoframe size.

Core Changes:
- Silence vblank output during init.
- Fix DP-MST corruption during send msg timeout.
- Clear leak in drm_gem_objecs_lookup().
- Make newlines work with force connector attribute.
- Fix module refcounting error in drm_encoder_slave, and use new i2c api.
- Header fix for drm_managed.c
- More struct_mutex removal for !legacy drivers:
  - Remove gem_free_object()
  - Removal of drm_gem_object_put_unlocked().
- Show current->comm alongside pid in debug printfs.
- Add drm_client_modeset_check() + drm_client_framebuffer_flush().
- Replace drm_fb_swab16 with drm_fb_swap that also supports 32-bits.
- Remove mode->vrefresh, and compactify drm_display_mode.
- Use drm_* macros for logging and warnings.
- Add WARN when drm_gem_get_pages is used on a private obj.
- Handle importing and imported dmabuf better in shmem helpers.
- Small fix for drm/mm hole size comparison, and remove invalid entry optimization.
- Add a drm/mm selftest.
- Set DSI connector type for DSI panels.
- Assorted small fixes and documentation updates.
- Fix DDI I2C device registration for MST ports, and flushing on destroy.
- Fix master_set return type, used by vmwgfx.
- Make the drm_set/drop_master ioctl symmetrical.

Driver Changes:
 Allow iommu in the sun4i driver and use it for sun8i.
- Simplify backlight lookup for omap, amba-clcd and tilcdc.
- Hold reg_lock for rockchip.
- Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice.
- Small assorted fixes to tilcdc, vc4, i915, omap, fbdev/sm712fb, fbdev/pxafb, console/newport_con, msm, virtio, udl, malidp, hdlcd, bridge/ti-sn65dsi86, panfrost.
- Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers.
- Add support for KOE  Allow iommu in the sun4i driver and use it for sun8i.
- Simplify backlight lookup for omap, amba-clcd and tilcdc.
- Hold reg_lock for rockchip.
- Add support for bridge gpio and lane reordering + polarity to ti-sn65dsi86, and fix clock choice.
- Small assorted fixes to tilcdc, vc4 (multiple), i915.
- Remove hw cursor support for mgag200, and use simple kms helper + shmem helpers.
- Add support for KOE TX26D202VM0BWA panel.
- Use GEM CMA functions in arc, arm, atmel-hlcdc, fsi-dcu, hisilicon, imx, ingenic, komeda, malidp, mcde, meson, msxfb, rcar-du, shmobile, stm, sti, tilcdc, tve200, zte.
- Remove gem_print_info.
- Improve gem_create_object_helper so udl can use shmem helpers.
- Convert vc4 dt bindings to schemas, and add clock properties.
- Device initialization cleanups for mgag200.
- Add a workaround to fix DP-MST short pulses handling on broken hardware in i915.
- Allow build test compiling arm drivers.
- Use managed pci functions in mgag200 and ast.
- Use dev_groups in malidp.
- Add per pixel alpha support for PX30 VOP in rockchip.
- Silence deferred probe logs in panfrost.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/001cd9a6-405d-4e29-43d8-354f53ae4e8b@linux.intel.com
parents 48778464 114427b8

Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ properties: 
      - const: bus

      - const: mod



  iommus:

    maxItems: 1



  resets:

    maxItems: 1

Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt

deleted100644 → 0
+0 −174
Original line number Diff line number Diff line 
Broadcom VC4 (VideoCore4) GPU



The VC4 device present on the Raspberry Pi includes a display system

with HDMI output and the HVS (Hardware Video Scaler) for compositing

display planes.



Required properties for VC4:

- compatible:	Should be "brcm,bcm2835-vc4" or "brcm,cygnus-vc4"



Required properties for Pixel Valve:

- compatible:	Should be one of "brcm,bcm2835-pixelvalve0",

		  "brcm,bcm2835-pixelvalve1", or "brcm,bcm2835-pixelvalve2"

- reg:		Physical base address and length of the PV's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Required properties for HVS:

- compatible:	Should be "brcm,bcm2835-hvs"

- reg:		Physical base address and length of the HVS's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Required properties for HDMI

- compatible:	Should be "brcm,bcm2835-hdmi"

- reg:		Physical base address and length of the two register ranges

		  ("HDMI" and "HD", in that order)

- interrupts:	The interrupt numbers

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

- ddc:		phandle of the I2C controller used for DDC EDID probing

- clocks:	a) hdmi: The HDMI state machine clock

		b) pixel: The pixel clock.



Optional properties for HDMI:

- hpd-gpios:	The GPIO pin for HDMI hotplug detect (if it doesn't appear

		  as an interrupt/status bit in the HDMI controller

		  itself).  See bindings/pinctrl/brcm,bcm2835-gpio.txt

- dmas:		Should contain one entry pointing to the DMA channel used to

		transfer audio data

- dma-names:	Should contain "audio-rx"



Required properties for DPI:

- compatible:	Should be "brcm,bcm2835-dpi"

- reg:		Physical base address and length of the registers

- clocks:	a) core: The core clock the unit runs on

		b) pixel: The pixel clock that feeds the pixelvalve

- port:		Port node with a single endpoint connecting to the panel

		  device, as defined in [1]



Required properties for VEC:

- compatible:	Should be "brcm,bcm2835-vec"

- reg:		Physical base address and length of the registers

- clocks:	The core clock the unit runs on

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Required properties for V3D:

- compatible:	Should be "brcm,bcm2835-v3d" or "brcm,cygnus-v3d"

- reg:		Physical base address and length of the V3D's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Optional properties for V3D:

- clocks:	The clock the unit runs on



Required properties for DSI:

- compatible:	Should be "brcm,bcm2835-dsi0" or "brcm,bcm2835-dsi1"

- reg:		Physical base address and length of the DSI block's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt

- clocks:	a) phy: The DSI PLL clock feeding the DSI analog PHY

		b) escape: The DSI ESC clock from CPRMAN

		c) pixel: The DSI pixel clock from CPRMAN

- clock-output-names:

		The 3 clocks output from the DSI analog PHY: dsi[01]_byte,

		dsi[01]_ddr2, and dsi[01]_ddr



Required properties for the TXP (writeback) block:

- compatible:	Should be "brcm,bcm2835-txp"

- reg:		Physical base address and length of the TXP block's registers

- interrupts:	The interrupt number

		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



[1] Documentation/devicetree/bindings/media/video-interfaces.txt



Example:

pixelvalve@7e807000 {

	compatible = "brcm,bcm2835-pixelvalve2";

	reg = <0x7e807000 0x100>;

	interrupts = <2 10>; /* pixelvalve */

};



hvs@7e400000 {

	compatible = "brcm,bcm2835-hvs";

	reg = <0x7e400000 0x6000>;

	interrupts = <2 1>;

};



hdmi: hdmi@7e902000 {

	compatible = "brcm,bcm2835-hdmi";

	reg = <0x7e902000 0x600>,

	      <0x7e808000 0x100>;

	interrupts = <2 8>, <2 9>;

	ddc = <&i2c2>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

	clocks = <&clocks BCM2835_PLLH_PIX>,

		 <&clocks BCM2835_CLOCK_HSM>;

	clock-names = "pixel", "hdmi";

};



dpi: dpi@7e208000 {

	compatible = "brcm,bcm2835-dpi";

	reg = <0x7e208000 0x8c>;

	clocks = <&clocks BCM2835_CLOCK_VPU>,

	         <&clocks BCM2835_CLOCK_DPI>;

	clock-names = "core", "pixel";

	#address-cells = <1>;

	#size-cells = <0>;



	port {

		dpi_out: endpoint@0 {

			remote-endpoint = <&panel_in>;

		};

	};

};



dsi1: dsi@7e700000 {

	compatible = "brcm,bcm2835-dsi1";

	reg = <0x7e700000 0x8c>;

	interrupts = <2 12>;

	#address-cells = <1>;

	#size-cells = <0>;

	#clock-cells = <1>;



	clocks = <&clocks BCM2835_PLLD_DSI1>,

		 <&clocks BCM2835_CLOCK_DSI1E>,

		 <&clocks BCM2835_CLOCK_DSI1P>;

	clock-names = "phy", "escape", "pixel";



	clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";



	pitouchscreen: panel@0 {

		compatible = "raspberrypi,touchscreen";

		reg = <0>;



		<...>

	};

};



vec: vec@7e806000 {

	compatible = "brcm,bcm2835-vec";

	reg = <0x7e806000 0x1000>;

	clocks = <&clocks BCM2835_CLOCK_VEC>;

	interrupts = <2 27>;

};



v3d: v3d@7ec00000 {

	compatible = "brcm,bcm2835-v3d";

	reg = <0x7ec00000 0x1000>;

	interrupts = <1 10>;

};



vc4: gpu {

	compatible = "brcm,bcm2835-vc4";

};



panel: panel {

	compatible = "ontat,yx700wv03", "simple-panel";



	port {

		panel_in: endpoint {

			remote-endpoint = <&dpi_out>;

		};

	};

};

Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml

0 → 100644
+72 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/brcm,bcm2835-dpi.yaml#

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



title: Broadcom VC4 (VideoCore4) DPI Controller



maintainers:

  - Eric Anholt <eric@anholt.net>



properties:

  compatible:

    const: brcm,bcm2835-dpi



  reg:

    maxItems: 1



  clocks:

    items:

      - description: The core clock the unit runs on

      - description: The pixel clock that feeds the pixelvalve



  clock-names:

    items:

      - const: core

      - const: pixel



  port:

    type: object

    description: >

      Port node with a single endpoint connecting to the panel, as

      defined in Documentation/devicetree/bindings/media/video-interfaces.txt.



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - port



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/bcm2835.h>



    panel: panel {

        compatible = "ontat,yx700wv03", "simple-panel";



        port {

            panel_in: endpoint {

                remote-endpoint = <&dpi_out>;

            };

        };

    };



    dpi: dpi@7e208000 {

        compatible = "brcm,bcm2835-dpi";

        reg = <0x7e208000 0x8c>;

        clocks = <&clocks BCM2835_CLOCK_VPU>,

                 <&clocks BCM2835_CLOCK_DPI>;

        clock-names = "core", "pixel";



        port {

            dpi_out: endpoint {

                remote-endpoint = <&panel_in>;

            };

        };

    };



...

Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml

0 → 100644
+84 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/brcm,bcm2835-dsi0.yaml#

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



title: Broadcom VC4 (VideoCore4) DSI Controller



maintainers:

  - Eric Anholt <eric@anholt.net>



properties:

  "#clock-cells":

    const: 1



  compatible:

    enum:

      - brcm,bcm2835-dsi0

      - brcm,bcm2835-dsi1



  reg:

    maxItems: 1



  clocks:

    items:

      - description: The DSI PLL clock feeding the DSI analog PHY

      - description: The DSI ESC clock

      - description: The DSI pixel clock



  clock-names:

    items:

      - const: phy

      - const: escape

      - const: pixel



  clock-output-names: true

    # FIXME: The meta-schemas don't seem to allow it for now

    # items:

    #   - description: The DSI byte clock for the PHY

    #   - description: The DSI DDR2 clock

    #   - description: The DSI DDR clock



  interrupts:

    maxItems: 1



required:

  - "#clock-cells"

  - compatible

  - reg

  - clocks

  - clock-names

  - clock-output-names

  - interrupts



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/bcm2835.h>



    dsi1: dsi@7e700000 {

        compatible = "brcm,bcm2835-dsi1";

        reg = <0x7e700000 0x8c>;

        interrupts = <2 12>;

        #address-cells = <1>;

        #size-cells = <0>;

        #clock-cells = <1>;



        clocks = <&clocks BCM2835_PLLD_DSI1>,

                 <&clocks BCM2835_CLOCK_DSI1E>,

                 <&clocks BCM2835_CLOCK_DSI1P>;

        clock-names = "phy", "escape", "pixel";



        clock-output-names = "dsi1_byte", "dsi1_ddr2", "dsi1_ddr";



        pitouchscreen: panel@0 {

            compatible = "raspberrypi,touchscreen";

            reg = <0>;



            /* ... */

        };

    };



...

Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml

0 → 100644
+80 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/brcm,bcm2835-hdmi.yaml#

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



title: Broadcom VC4 (VideoCore4) HDMI Controller



maintainers:

  - Eric Anholt <eric@anholt.net>



properties:

  compatible:

    const: brcm,bcm2835-hdmi



  reg:

    items:

      - description: HDMI register range

      - description: HD register range



  interrupts:

    minItems: 2



  clocks:

    items:

      - description: The pixel clock

      - description: The HDMI state machine clock



  clock-names:

    items:

      - const: pixel

      - const: hdmi



  ddc:

    allOf:

      - $ref: /schemas/types.yaml#/definitions/phandle

    description: >

      Phandle of the I2C controller used for DDC EDID probing



  hpd-gpios:

    description: >

      The GPIO pin for the HDMI hotplug detect (if it doesn't appear

      as an interrupt/status bit in the HDMI controller itself)



  dmas:

    maxItems: 1

    description: >

      Should contain one entry pointing to the DMA channel used to

      transfer audio data.



  dma-names:

    const: audio-rx



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - ddc



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/bcm2835.h>

    #include <dt-bindings/gpio/gpio.h>



    hdmi: hdmi@7e902000 {

        compatible = "brcm,bcm2835-hdmi";

        reg = <0x7e902000 0x600>,

              <0x7e808000 0x100>;

        interrupts = <2 8>, <2 9>;

        ddc = <&i2c2>;

        hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

        clocks = <&clocks BCM2835_PLLH_PIX>,

                 <&clocks BCM2835_CLOCK_HSM>;

        clock-names = "pixel", "hdmi";

    };



...

CRA Git | Maintained and supported by SUSTech CRA and CCSE