Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Cross-subsystem Changes:
- dt-bindings: add vendor prefix for NLT Technologies, Ltd. (Lucas)
- dt-bindings: Add support for samsung s6e3hf2 panel (Hoegeun)

Core Changes:
- Add drm_panel_bridge to avoid connector boilerplate in drivers (Eric)
- Trival fixes for dupe forward decl and reduce scope of variable (Dawid)

Driver Changes:
- dw-hdmi: Use mode_valid hook on bridge instead of connector (Jose)
- vc4,atmel-hlcdc: Use drm_panel_bridge where appropriate (Eric)
- panel: Add Innolux P079ZCA panel driver (Chris)
- panel-simple: Add NL12880B20-05, NL192108AC18-02D, P320HVN03 panels (Lucas)
- panel-samsung-s6e3ha2: Add s6e3hf2 panel support (Hoegeun)
- zte,vc4,pl111,panel,mxsfb: Miscellaneous fixes

Cc: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Chris Zhong <zyw@rock-chips.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Cc: Dawid Kurek <dawikur@gmail.com>

* tag 'drm-misc-next-2017-06-15' of git://anongit.freedesktop.org/git/drm-misc: (26 commits)
  drm: Reduce scope of 'state' variable
  drm: mxsfb_crtc: Reset the eLCDIF controller
  drm: Remove duplicate forward declaration
  drm/panel: s6e3ha2: Add support for s6e3hf2 panel on TM2e board
  dt-bindings: Add support for samsung s6e3hf2 panel
  drm/panel: add backlight dependency for sitronix-st7789v
  drm/panel: S6E3HA2 needs backlight code
  drm/panel: simple: add support for AUO P320HVN03
  drm/panel: simple: add support for NLT NL192108AC18-02D
  dt-bindings: add vendor prefix for NLT Technologies, Ltd.
  drm/panel: simple: add support for NEC NL12880B20-05
  drm/panel: add Innolux P079ZCA panel driver
  dt-bindings: Add INNOLUX P079ZCA panel bindings
  drm/vc4: Fix resource leak in 'vc4_get_hang_state_ioctl()' in error handling path
  drm/vc4/vc4_bo.c: always set bo->resv
  drm: Add const to name field declaration in struct drm_prop_enum_list
  drm/pl111: Fix offset calculation for the primary plane.
  drm/atmel-hlcdc: Fix panel registration
  drm/bridge: Build the panel wrapper in drm_kms_helper
  drm/atmel-hlcdc: Replace the panel usage with drm_panel_bridge.
  ...
parents 3ee45a3b ac7c7483

Documentation/devicetree/bindings/display/panel/auo,p320hvn03.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
AU Optronics Corporation 31.5" FHD (1920x1080) TFT LCD panel



Required properties:

- compatible: should be "auo,p320hvn03"

- power-supply: as specified in the base binding



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/innolux,p079zca.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Innolux P079ZCA 7.85" 768x1024 TFT LCD panel



Required properties:

- compatible: should be "innolux,p079zca"

- reg: DSI virtual channel of the peripheral

- power-supply: phandle of the regulator that provides the supply voltage

- enable-gpios: panel enable gpio



Optional properties:

- backlight: phandle of the backlight device attached to the panel



Example:



	&mipi_dsi {

		panel {

			compatible = "innolux,p079zca";

			reg = <0>;

			power-supply = <...>;

			backlight = <&backlight>;

			enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;

			status = "okay";

		};

	};

Documentation/devicetree/bindings/display/panel/nec,nl12880b20-05.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
NEC LCD Technologies, Ltd. 12.1" WXGA (1280x800) LVDS TFT LCD panel



Required properties:

- compatible: should be "nec,nl12880bc20-05"

- power-supply: as specified in the base binding



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/nlt,nl192108ac18-02d.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
NLT Technologies, Ltd. 15.6" FHD (1920x1080) LVDS TFT LCD panel



Required properties:

- compatible: should be "nlt,nl192108ac18-02d"

- power-supply: as specified in the base binding



This binding is compatible with the simple-panel binding, which is specified

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/display/panel/samsung,s6e3ha2.txt

+4 −1
Original line number Diff line number Diff line 
Samsung S6E3HA2 5.7" 1440x2560 AMOLED panel

Samsung S6E3HF2 5.65" 1600x2560 AMOLED panel



Required properties:

  - compatible: "samsung,s6e3ha2"

  - compatible: should be one of:

    "samsung,s6e3ha2",

    "samsung,s6e3hf2".

  - reg: the virtual channel number of a DSI peripheral

  - vdd3-supply: I/O voltage supply

  - vci-supply: voltage supply for analog circuits