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

Commit af3c8d98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux 

Pull drm updates from Dave Airlie:
 "This is the main pull request for the drm, I think I've got one later
  driver pull for mediatek SoC driver, I'm undecided on if it needs to
  go to you yet.

  Otherwise summary below:

  Core drm:
   - Atomic add driver private objects
   - Deprecate preclose hook in modern drivers
   - MST bandwidth tracking
   - Use kvmalloc in more places
   - Add mode_valid hook for crtc/encoder/bridge
   - Reduce sync_file construction time
   - Documentation updates
   - New DRM synchronisation object support

  New drivers:
   - pl111 - pl111 CLCD display controller

  Panel:
   - Innolux P079ZCA panel driver
   - Add NL12880B20-05, NL192108AC18-02D, P320HVN03 panels
   - panel-samsung-s6e3ha2: Add s6e3hf2 panel support

  i915:
   - SKL+ watermark fixes
   - G4x/G33 reset improvements
   - DP AUX backlight improvements
   - Buffer based GuC/host communication
   - New getparam for (sub)slice infomation
   - Cannonlake and Coffeelake initial patches
   - Execbuf optimisations

  radeon/amdgpu:
   - Lots of Vega10 bug fixes
   - Preliminary raven support
   - KIQ support for compute rings
   - MEC queue management rework
   - DCE6 Audio support
   - SR-IOV improvements
   - Better radeon/amdgpu selection support

  nouveau:
   - HDMI stereoscopic support
   - Display code rework for >= GM20x GPUs

  msm:
   - GEM rework for fine-grained locking
   - Per-process pagetable work
   - HDMI fixes for Snapdragon 820.

  vc4:
   - Remove 256MB CMA limit from vc4
   - Add out-fence support
   - Add support for cygnus
   - Get/set tiling ioctls support
   - Add T-format tiling support for scanout

  zte:
   - add VGA support.

  etnaviv:
   - Thermal throttle support for newer GPUs
   - Restore userspace buffer cache performance
   - dma-buf sync fix

  stm:
   - add stm32f429 display support

  exynos:
   - Rework vblank handling
   - Fixup sw-trigger code

  sun4i:
   - V3s display engine support
   - HDMI support for older SoCs
   - Preliminary work on dual-pipeline SoCs.

  rcar-du:
   - VSP work

  imx-drm:
   - Remove counter load enable from PRE
   - Double read/write reduction flag support

  tegra:
   - Documentation for the host1x and drm driver.
   - Lots of staging ioctl fixes due to grate project work.

  omapdrm:
   - dma-buf fence support
   - TILER rotation fixes"

* tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux: (1270 commits)
  drm: Remove unused drm_file parameter to drm_syncobj_replace_fence()
  drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.
  amdgpu: Set cik/si_support to 1 by default if radeon isn't built
  drm/amdgpu/gfx9: fix driver reload with KIQ
  drm/amdgpu/gfx8: fix driver reload with KIQ
  drm/amdgpu: Don't call amd_powerplay_destroy() if we don't have powerplay
  drm/ttm: Fix use-after-free in ttm_bo_clean_mm
  drm/amd/amdgpu: move get memory type function from early init to sw init
  drm/amdgpu/cgs: always set reference clock in mode_info
  drm/amdgpu: fix vblank_time when displays are off
  drm/amd/powerplay: power value format change for Vega10
  drm/amdgpu/gfx9: support the amdgpu.disable_cu option
  drm/amd/powerplay: change PPSMC_MSG_GetCurrPkgPwr for Vega10
  drm/amdgpu: Make amdgpu_cs_parser_init static (v2)
  drm/amdgpu/cs: fix a typo in a comment
  drm/amdgpu: Fix the exported always on CU bitmap
  drm/amdgpu/gfx9: gfx_v9_0_enable_gfx_static_mg_power_gating() can be static
  drm/amdgpu/psp: upper_32_bits/lower_32_bits for address setup
  drm/amd/powerplay/cz: print message if smc message fails
  drm/amdgpu: fix typo in amdgpu_debugfs_test_ib_init
  ...
parents d3e3b7ea 00fc2c26

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/exynos/exynos5433-decon.txt

+7 −6
Original line number Diff line number Diff line
@@ -8,12 +8,13 @@ Required properties: 
- compatible: value should be one of:

	"samsung,exynos5433-decon", "samsung,exynos5433-decon-tv";

- reg: physical base address and length of the DECON registers set.

- interrupts: should contain a list of all DECON IP block interrupts in the

	      order: VSYNC, LCD_SYSTEM. The interrupt specifier format

	      depends on the interrupt controller used.

- interrupt-names: should contain the interrupt names: "vsync", "lcd_sys"

		   in the same order as they were listed in the interrupts

		   property.

- interrupt-names: should contain the interrupt names depending on mode of work:

		video mode: "vsync",

		command mode: "lcd_sys",

		command mode with software trigger: "lcd_sys", "te".

- interrupts or interrupts-extended: list of interrupt specifiers corresponding

		to names privided in interrupt-names, as described in

		interrupt-controller/interrupts.txt

- clocks: must include clock specifiers corresponding to entries in the

	  clock-names property.

- clock-names: list of clock names sorted in the same order as the clocks

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.