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

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



drm-misc-next for v5.6:

UAPI Changes:
- Allow overriding number of bootup penguins in fbcon using fbcon=logo-count:n.

Cross-subsystem Changes:
- fbdev fixes for mmp, and make it work with CONFIG_COMPILE_TEST.
- Use devm_platform_ioremap_resource in fbdev drivers.
- Various small fbdev fixes.

Core Changes:
- Support scanline alignment for dumb buffers.
- Add atomic_check() hook to bridge ops, to support bus format negotiation.
- Add gem_create_object() to vram helpers.

Driver Changes:
- Rockchip: Add support for PX30.
- Use generic fbdev code and dumb helpers in hisilicon/hibmc.
- Add support for Leadtek LTK500HD1829 panel, and xinpeng XPP055C272.
- Clock fixes for atmel-hlcdc.
- Various smaller fixes to all drivers.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8eff1e3f-ef0a-2dd9-9a14-6273b1d6f963@linux.intel.com
parents 528d06d4 3cacb208

Documentation/devicetree/bindings/display/panel/leadtek,ltk500hd1829.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/leadtek,ltk500hd1829.yaml#

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



title: Leadtek LTK500HD1829 5.0in 720x1280 DSI panel



maintainers:

  - Heiko Stuebner <heiko.stuebner@theobroma-systems.com>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: leadtek,ltk500hd1829

  reg: true

  backlight: true

  reset-gpios: true

  iovcc-supply:

     description: regulator that supplies the iovcc voltage

  vcc-supply:

     description: regulator that supplies the vcc voltage



required:

  - compatible

  - reg

  - backlight

  - iovcc-supply

  - vcc-supply



additionalProperties: false



examples:

  - |

    dsi@ff450000 {

        #address-cells = <1>;

        #size-cells = <0>;

        panel@0 {

            compatible = "leadtek,ltk500hd1829";

            reg = <0>;

            backlight = <&backlight>;

            iovcc-supply = <&vcc_1v8>;

            vcc-supply = <&vcc_2v8>;

        };

    };



...

Documentation/devicetree/bindings/display/panel/xinpeng,xpp055c272.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/panel/xinpeng,xpp055c272.yaml#

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



title: Xinpeng XPP055C272 5.5in 720x1280 DSI panel



maintainers:

  - Heiko Stuebner <heiko.stuebner@theobroma-systems.com>



allOf:

  - $ref: panel-common.yaml#



properties:

  compatible:

    const: xinpeng,xpp055c272

  reg: true

  backlight: true

  reset-gpios: true

  iovcc-supply:

     description: regulator that supplies the iovcc voltage

  vci-supply:

     description: regulator that supplies the vci voltage



required:

  - compatible

  - reg

  - backlight

  - iovcc-supply

  - vci-supply



additionalProperties: false



examples:

  - |

    dsi@ff450000 {

        #address-cells = <1>;

        #size-cells = <0>;

        panel@0 {

            compatible = "xinpeng,xpp055c272";

            reg = <0>;

            backlight = <&backlight>;

            iovcc-supply = <&vcc_1v8>;

            vci-supply = <&vcc3v3_lcd>;

        };

    };



...

Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Rockchip RK3288 LVDS interface 
Required properties:

- compatible: matching the soc type, one of

	- "rockchip,rk3288-lvds";

	- "rockchip,px30-lvds";



- reg: physical base address of the controller and length

	of memory mapped region.
@@ -18,6 +19,9 @@ Required properties: 
- rockchip,grf: phandle to the general register files syscon

- rockchip,output: "rgb", "lvds" or "duallvds", This describes the output interface



- phys: LVDS/DSI DPHY (px30 only)

- phy-names: name of the PHY, must be "dphy" (px30 only)



Optional properties:

- pinctrl-names: must contain a "lcdc" entry.

- pinctrl-0: pin control group to be used for this controller.

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -513,6 +513,8 @@ patternProperties: 
    description: Lantiq Semiconductor

  "^lattice,.*":

    description: Lattice Semiconductor

  "^leadtek,.*":

    description: Shenzhen Leadtek Technology Co., Ltd.

  "^leez,.*":

    description: Leez

  "^lego,.*":
@@ -1056,6 +1058,8 @@ patternProperties: 
    description: Extreme Engineering Solutions (X-ES)

  "^xillybus,.*":

    description: Xillybus Ltd.

  "^xinpeng,.*":

    description: Shenzhen Xinpeng Technology Co., Ltd

  "^xlnx,.*":

    description: Xilinx

  "^xunlong,.*":

Documentation/fb/fbcon.rst

+9 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ C. Boot options 
	is typically located on the same video card.  Thus, the consoles that

	are controlled by the VGA console will be garbled.



4. fbcon=rotate:<n>

5. fbcon=rotate:<n>



	This option changes the orientation angle of the console display. The

	value 'n' accepts the following:
@@ -152,21 +152,21 @@ C. Boot options 
	Actually, the underlying fb driver is totally ignorant of console

	rotation.



5. fbcon=margin:<color>

6. fbcon=margin:<color>



	This option specifies the color of the margins. The margins are the

	leftover area at the right and the bottom of the screen that are not

	used by text. By default, this area will be black. The 'color' value

	is an integer number that depends on the framebuffer driver being used.



6. fbcon=nodefer

7. fbcon=nodefer



	If the kernel is compiled with deferred fbcon takeover support, normally

	the framebuffer contents, left in place by the firmware/bootloader, will

	be preserved until there actually is some text is output to the console.

	This option causes fbcon to bind immediately to the fbdev device.



7. fbcon=logo-pos:<location>

8. fbcon=logo-pos:<location>



	The only possible 'location' is 'center' (without quotes), and when

	given, the bootup logo is moved from the default top-left corner
@@ -174,6 +174,11 @@ C. Boot options 
	displayed due to multiple CPUs, the collected line of logos is moved

	as a whole.



9. fbcon=logo-count:<n>



	The value 'n' overrides the number of bootup logos. 0 disables the

	logo, and -1 gives the default which is the number of online CPUs.



C. Attaching, Detaching and Unloading



Before going on to how to attach, detach and unload the framebuffer console, an

CRA Git | Maintained and supported by SUSTech CRA and CCSE