Commit b0383c06 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2019-08-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.4:

UAPI Changes:
 - HDCP: Add a Content protection type property

Cross-subsystem Changes:

Core Changes:
 - Continue to rework the include dependencies
 - fb: Remove the unused drm_gem_fbdev_fb_create function
 - drm-dp-helper: Make the link rate calculation more tolerant to
                  non-explicitly defined, yet supported, rates
 - fb-helper: Map DRM client buffer only when required, and instanciate a
              shadow buffer when the device has a dirty function or says so
 - connector: Add a helper to link the DDC adapter used by that connector to
              the userspace
 - vblank: Switch from DRM_WAIT_ON to wait_event_interruptible_timeout
 - dma-buf: Fix a stack corruption
 - ttm: Embed a drm_gem_object struct to make ttm_buffer_object a
        superclass of GEM, and convert drivers to use it.
 - hdcp: Improvements to report the content protection type to the
         userspace

Driver Changes:
 - Remove drm_gem_prime_import/export from being defined in the drivers
 - Drop DRM_AUTH usage from drivers
 - Continue to drop drmP.h
 - Convert drivers to the connector ddc helper

 - ingenic: Add support for more panel-related cases
 - komeda: Support for dual-link
 - lima: Reduce logging
 - mpag200: Fix the cursor support
 - panfrost: Export GPU features register to userspace through an ioctl
 - pl111: Remove the CLD pads wiring support from the DT
 - rockchip: Rework to use DRM PSR helpers, fix a bug in the VOP_WIN_GET
             macro
 - sun4i: Improve support for color encoding and range
 - tinydrm: Rework SPI support, improve MIPI-DBI support, move to drm/tiny
 - vkms: Rework of the CRC tracking

 - bridges:
   - sii902x: Add support for audio graph card
   - tc358767: Rework AUX data handling code
   - ti-sn65dsi86: Add Debugfs and proper DSI mode flags support

 - panels
   - Support for GiantPlus GPM940B0, Sharp LQ070Y3DG3B, Ortustech
     COM37H3M, Novatek NT39016, Sharp LS020B1DD01D, Raydium RM67191,
     Boe Himax8279d, Sharp LD-D5116Z01B
   - Conversion of the device tree bindings to the YAML description
   - jh057n00900: Rework the enable / disable path

 - fbdev:
   - ssd1307fb: Support more devices based on that controller

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

From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190808121423.xzpedzkpyecvsiy4@flea
parents dce14e36 cc8f1299

Documentation/devicetree/bindings/display/arm,pl11x.txt

+5 −4
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ Required sub-nodes: 


- port: describes LCD panel signals, following the common binding

	for video transmitter interfaces; see

	Documentation/devicetree/bindings/media/video-interfaces.txt;

	when it is a TFT panel, the port's endpoint must define the

	following property:

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



Deprecated properties:

	The port's endbpoint subnode had this, now deprecated property

	in the past. Drivers should be able to survive without it:



	- arm,pl11x,tft-r0g0b0-pads: an array of three 32-bit values,

		defining the way CLD pads are wired up; first value
@@ -80,7 +82,6 @@ Example: 
		port {

			clcd_pads: endpoint {

				remote-endpoint = <&clcd_panel>;

				arm,pl11x,tft-r0g0b0-pads = <0 8 16>;

			};

		};

Documentation/devicetree/bindings/display/bridge/sii902x.txt

+2 −3
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ Optional properties: 
	- clocks: phandle and clock specifier for each clock listed in

           the clock-names property

	- clock-names: "mclk"

	   Describes SII902x MCLK input. MCLK is used to produce

	   HDMI audio CTS values. This property is required if

	   "#sound-dai-cells"-property is present. This property follows

	   Describes SII902x MCLK input. MCLK can be used to produce

	   HDMI audio CTS values. This property follows

	   Documentation/devicetree/bindings/clock/clock-bindings.txt

	   consumer binding.

Documentation/devicetree/bindings/display/panel/ampire,am-480272h3tmqw-t01h.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/ampire,am-480272h3tmqw-t01h.yaml#

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



title: Ampire AM-480272H3TMQW-T01H 4.3" WQVGA TFT LCD panel



maintainers:

  - Yannick Fertre <yannick.fertre@st.com>

  - Thierry Reding <treding@nvidia.com>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: ampire,am-480272h3tmqw-t01h



  power-supply: true

  enable-gpios: true

  backlight: true

  port: true



required:

  - compatible



additionalProperties: false



examples:

  - |

    panel_rgb: panel {

      compatible = "ampire,am-480272h3tmqw-t01h";

      enable-gpios = <&gpioa 8 1>;

      port {

        panel_in_rgb: endpoint {

          remote-endpoint = <&controller_out_rgb>;

        };

      };

    };



...

Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
- compatible: should be "arm,versatile-tft-panel"



Required subnodes:

- port: see display/panel/panel-common.txt, graph.txt

- port: see display/panel/panel-common.yaml, graph.txt





Example:

Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
Armadeus ST0700 Adapt. A Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT with

an adapter board.



Required properties:

- compatible: "armadeus,st0700-adapt"

- power-supply: see panel-common.txt



Optional properties:

- backlight: see panel-common.txt

CRA Git | Maintained and supported by SUSTech CRA and CCSE