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

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

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

UAPI Changes:
- Return -ENODEV instead of -ENXIO when creating cma fb w/o valid gem (Daniel)
- Add aspect ratio and custom scaling propertis to connector state (Maarten)

Cross-subsystem Changes:
- None

Core Changes:
- Add Laurent as bridge reviewer and Andrzej as bridge maintainer (Archit)
- Maintain new STM driver through -misc (Yannick)
- Misc doc improvements (as is tradition) (Daniel)
- Add driver-private objects to atomic state (Dhinakaran)
- Deprecate preclose hook in modern drivers (use postclose) (Daniel)
- Add hwmode to vblank struct. This fixes mode access in irq context and reduced
  a bunch of boilerplate (Daniel)

Driver Changes:
- vc4: Add out-fence support to vc4 V3D rendering (Eric)
- stm: Add stm32f429 display hw and am-480272h3tmqw-t01h panel support (Yannick)
- vc4: Remove 256MB cma limit from vc4 (Eric)
- dw-hdmi: Disable audio when inactive, instead of always enabled (Romain)
- zte: Add support for VGA to the ZTE driver (Shawn)
- i915: Track DP MST bandwidth and check it in atomic_check (Dhinakaran)
- vgem: Enable gem dmabuf import iface to facilitate ion testing (Laura)
- vc4: Add support for Cygnus (new dt compat string + couple bug fixes) (Eric)
- pl111: Add driver for pl111 CLCD display controller (Eric/Tom)
- vgem: Subclass drm_device instead of standalone platform device (Chris)

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Romain Perier <romain.perier@collabora.com>
Cc: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tom Cooksey <tom.cooksey@arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>

* tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc: (72 commits)
  drm: add missing declaration to drm_blend.h
  drm/dp: Wait up all outstanding tx waiters
  drm/dp: Read the tx msg state once after checking for an event
  drm/prime: Forward declare struct device
  drm/vblank: Lock down vblank->hwmode more
  drm/vblank: drop the mode argument from drm_calc_vbltimestamp_from_scanoutpos
  drm/vblank: Add FIXME comments about moving the vblank ts hooks
  drm/vblank: Switch to bool in_vblank_irq in get_vblank_timestamp
  drm/vblank: Switch drm_driver->get_vblank_timestamp to return a bool
  drm/vgem: Convert to a struct drm_device subclass
  gpu: drm: gma500: remove dead code
  drm/sti: Adjust two checks for null pointers in sti_hqvdp_probe()
  drm/sti: Fix typos in a comment line
  drm/sti: Fix a typo in a comment line
  drm/sti: Replace 17 seq_puts() calls by seq_putc()
  drm/sti: Reduce function calls for sequence output at five places
  drm/sti: use seq_puts to display a string
  drm: Nerf the preclose callback for modern drivers
  drm/exynos: Merge pre/postclose hooks
  drm/tegra: switch to postclose
  ...
parents 2ea659a9 9cf8f580

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

+5 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ with HDMI output and the HVS (Hardware Video Scaler) for compositing 
display planes.



Required properties for VC4:

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

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



Required properties for Pixel Valve:

- compatible:	Should be one of "brcm,bcm2835-pixelvalve0",
@@ -54,11 +54,14 @@ Required properties for VEC: 
		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt



Required properties for V3D:

- compatible:	Should be "brcm,bcm2835-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

Documentation/devicetree/bindings/display/st,stm32-ltdc.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* STMicroelectronics STM32 lcd-tft display controller



- ltdc: lcd-tft display controller host

  must be a sub-node of st-display-subsystem

  Required properties:

  - compatible: "st,stm32-ltdc"

  - reg: Physical base address of the IP registers and length of memory mapped region.

  - clocks: A list of phandle + clock-specifier pairs, one for each

    entry in 'clock-names'.

  - clock-names: A list of clock names. For ltdc it should contain:

      - "lcd" for the clock feeding the output pixel clock & IP clock.

  - resets: reset to be used by the device (defined by use of RCC macro).

  Required nodes:

    - Video port for RGB output.



Example:



/ {

	...

	soc {

	...

		ltdc: display-controller@40016800 {

			compatible = "st,stm32-ltdc";

			reg = <0x40016800 0x200>;

			interrupts = <88>, <89>;

			resets = <&rcc STM32F4_APB2_RESET(LTDC)>;

			clocks = <&rcc 1 CLK_LCD>;

			clock-names = "lcd";



			port {

				ltdc_out_rgb: endpoint {

				};

			};

		};

	};

};

Documentation/devicetree/bindings/display/zte,vou.txt

+21 −0
Original line number Diff line number Diff line
@@ -58,6 +58,18 @@ Required properties: 
   integer cells.  The first cell is the offset of SYSCTRL register used

   to control TV Encoder DAC power, and the second cell is the bit mask.



* VGA output device



Required properties:

 - compatible: should be "zte,zx296718-vga"

 - reg: Physical base address and length of the VGA device IO region

 - interrupts : VGA interrupt number to CPU

 - clocks: Phandle with clock-specifier pointing to VGA I2C clock.

 - clock-names: Must be "i2c_wclk".

 - zte,vga-power-control: the phandle to SYSCTRL block followed by two

   integer cells.  The first cell is the offset of SYSCTRL register used

   to control VGA DAC power, and the second cell is the bit mask.



Example:



vou: vou@1440000 {
@@ -81,6 +93,15 @@ vou: vou@1440000 { 
			      "main_wclk", "aux_wclk";

	};



	vga: vga@8000 {

		compatible = "zte,zx296718-vga";

		reg = <0x8000 0x1000>;

		interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&topcrm VGA_I2C_WCLK>;

		clock-names = "i2c_wclk";

		zte,vga-power-control = <&sysctrl 0x170 0xe0>;

	};



	hdmi: hdmi@c000 {

		compatible = "zte,zx296718-hdmi";

		reg = <0xc000 0x4000>;

Documentation/gpu/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Linux GPU Driver Developer's Guide 
   drm-uapi

   i915

   meson

   pl111

   tinydrm

   vc4

   vga-switcheroo

Documentation/gpu/pl111.rst

0 → 100644
+6 −0
Original line number Diff line number Diff line 
==========================================

 drm/pl111 ARM PrimeCell PL111 CLCD Driver

==========================================



.. kernel-doc:: drivers/gpu/drm/pl111/pl111_drv.c

   :doc: ARM PrimeCell PL111 CLCD Driver