Commit 4971f090 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2018-12-14' of git://anongit.freedesktop.org/drm/drm 

Pull drm updates from Dave Airlie:
 "Core:
   - shared fencing staging removal
   - drop transactional atomic helpers and move helpers to new location
   - DP/MST atomic cleanup
   - Leasing cleanups and drop EXPORT_SYMBOL
   - Convert drivers to atomic helpers and generic fbdev.
   - removed deprecated obj_ref/unref in favour of get/put
   - Improve dumb callback documentation
   - MODESET_LOCK_BEGIN/END helpers

  panels:
   - CDTech panels, Banana Pi Panel, DLC1010GIG,
   - Olimex LCD-O-LinuXino, Samsung S6D16D0, Truly NT35597 WQXGA,
   - Himax HX8357D, simulated RTSM AEMv8.
   - GPD Win2 panel
   - AUO G101EVN010

  vgem:
   - render node support

  ttm:
   - move global init out of drivers
   - fix LRU handling for ghost objects
   - Support for simultaneous submissions to multiple engines

  scheduler:
   - timeout/fault handling changes to help GPU recovery
   - helpers for hw with preemption support

  i915:
   - Scaler/Watermark fixes
   - DP MST + powerwell fixes
   - PSR fixes
   - Break long get/put shmemfs pages
   - Icelake fixes
   - Icelake DSI video mode enablement
   - Engine workaround improvements

  amdgpu:
   - freesync support
   - GPU reset enabled on CI, VI, SOC15 dGPUs
   - ABM support in DC
   - KFD support for vega12/polaris12
   - SDMA paging queue on vega
   - More amdkfd code sharing
   - DCC scanout on GFX9
   - DC kerneldoc
   - Updated SMU firmware for GFX8 chips
   - XGMI PSP + hive reset support
   - GPU reset
   - DC trace support
   - Powerplay updates for newer Polaris
   - Cursor plane update fast path
   - kfd dma-buf support

  virtio-gpu:
   - add EDID support

  vmwgfx:
   - pageflip with damage support

  nouveau:
   - Initial Turing TU104/TU106 modesetting support

  msm:
   - a2xx gpu support for apq8060 and imx5
   - a2xx gpummu support
   - mdp4 display support for apq8060
   - DPU fixes and cleanups
   - enhanced profiling support
   - debug object naming interface
   - get_iova/page pinning decoupling

  tegra:
   - Tegra194 host1x, VIC and display support enabled
   - Audio over HDMI for Tegra186 and Tegra194

  exynos:
   - DMA/IOMMU refactoring
   - plane alpha + blend mode support
   - Color format fixes for mixer driver

  rcar-du:
   - R8A7744 and R8A77470 support
   - R8A77965 LVDS support

  imx:
   - fbdev emulation fix
   - multi-tiled scalling fixes
   - SPDX identifiers

  rockchip
   - dw_hdmi support
   - dw-mipi-dsi + dual dsi support
   - mailbox read size fix

  qxl:
   - fix cursor pinning

  vc4:
   - YUV support (scaling + cursor)

  v3d:
   - enable TFU (Texture Formatting Unit)

  mali-dp:
   - add support for linear tiled formats

  sun4i:
   - Display Engine 3 support
   - H6 DE3 mixer 0 support
   - H6 display engine support
   - dw-hdmi support
   - H6 HDMI phy support
   - implicit fence waiting
   - BGRX8888 support

  meson:
   - Overlay plane support
   - implicit fence waiting
   - HDMI 1.4 4k modes

  bridge:
   - i2c fixes for sii902x"

* tag 'drm-next-2018-12-14' of git://anongit.freedesktop.org/drm/drm: (1403 commits)
  drm/amd/display: Add fast path for cursor plane updates
  drm/amdgpu: Enable GPU recovery by default for CI
  drm/amd/display: Fix duplicating scaling/underscan connector state
  drm/amd/display: Fix unintialized max_bpc state values
  Revert "drm/amd/display: Set RMX_ASPECT as default"
  drm/amdgpu: Fix stub function name
  drm/msm/dpu: Fix clock issue after bind failure
  drm/msm/dpu: Clean up dpu_media_info.h static inline functions
  drm/msm/dpu: Further cleanups for static inline functions
  drm/msm/dpu: Cleanup the debugfs functions
  drm/msm/dpu: Remove dpu_irq and unused functions
  drm/msm: Make irq_postinstall optional
  drm/msm/dpu: Cleanup callers of dpu_hw_blk_init
  drm/msm/dpu: Remove unused functions
  drm/msm/dpu: Remove dpu_crtc_is_enabled()
  drm/msm/dpu: Remove dpu_crtc_get_mixer_height
  drm/msm/dpu: Remove dpu_dbg
  drm/msm: dpu: Remove crtc_lock
  drm/msm: dpu: Remove vblank_requested flag from dpu_crtc
  drm/msm: dpu: Separate crtc assignment from vblank enable
  ...
parents c76cd634 2a3c83f5

Documentation/devicetree/bindings/bus/sun50i-de2-bus.txt

+6 −3
Original line number Diff line number Diff line 
Device tree bindings for Allwinner A64 DE2 bus

Device tree bindings for Allwinner DE2/3 bus



The Allwinner A64 DE2 is on a special bus, which needs a SRAM region (SRAM C)

to be claimed for enabling the access.

to be claimed for enabling the access. The DE3 on Allwinner H6 is at the same

situation, and the binding also applies.



Required properties:



 - compatible:		Should contain "allwinner,sun50i-a64-de2"

 - compatible:		Should be one of:

				- "allwinner,sun50i-a64-de2"

				- "allwinner,sun50i-h6-de3", "allwinner,sun50i-a64-de2"

 - reg:			A resource specifier for the register space

 - #address-cells:	Must be set to 1

 - #size-cells:		Must be set to 1

Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ Required properties: 
Optional properties:

- power-domains: Optional phandle to associated power domain as described in

	the file ../power/power_domain.txt

- amlogic,canvas: phandle to canvas provider node as described in the file

	../soc/amlogic/amlogic,canvas.txt



Required nodes:

Documentation/devicetree/bindings/display/bridge/renesas,lvds.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
  - "renesas,r8a7793-lvds" for R8A7793 (R-Car M2-N) compatible LVDS encoders

  - "renesas,r8a7795-lvds" for R8A7795 (R-Car H3) compatible LVDS encoders

  - "renesas,r8a7796-lvds" for R8A7796 (R-Car M3-W) compatible LVDS encoders

  - "renesas,r8a77965-lvds" for R8A77965 (R-Car M3-N) compatible LVDS encoders

  - "renesas,r8a77970-lvds" for R8A77970 (R-Car V3M) compatible LVDS encoders

  - "renesas,r8a77980-lvds" for R8A77980 (R-Car V3H) compatible LVDS encoders

  - "renesas,r8a77990-lvds" for R8A77990 (R-Car E3) compatible LVDS encoders

Documentation/devicetree/bindings/display/himax,hx8357d.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Himax HX8357D display panels



This binding is for display panels using a Himax HX8357D controller in SPI

mode, such as the Adafruit 3.5" TFT for Raspberry Pi.



Required properties:

- compatible:	"adafruit,yx350hv15", "himax,hx8357d"

- dc-gpios:	D/C pin

- reg:		address of the panel on the SPI bus



The node for this driver must be a child node of a SPI controller, hence

all mandatory properties described in ../spi/spi-bus.txt must be specified.



Optional properties:

- rotation:	panel rotation in degrees counter clockwise (0,90,180,270)

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



Example:

	display@0{

		compatible = "adafruit,yx350hv15", "himax,hx8357d";

		reg = <0>;

		spi-max-frequency = <32000000>;

		dc-gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;

		rotation = <90>;

		backlight = <&backlight>;

	};

Documentation/devicetree/bindings/display/msm/dsi.txt

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ Required properties: 
- clocks: Phandles to device clocks. See [1] for details on clock bindings.

- clock-names: the following clocks are required:

  * "iface"

  * "ref" (only required for new DTS files/entries)

  For 28nm HPM/LP, 28nm 8960 PHYs:

- vddio-supply: phandle to vdd-io regulator device node

  For 20nm PHY:

CRA Git | Maintained and supported by SUSTech CRA and CCSE