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

Commit 2d65a9f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 

Pull drm updates from Dave Airlie:
 "This is the main git pull for the drm,

  I pretty much froze major pulls at -rc5/6 time, and haven't had much
  fallout, so will probably continue doing that.

  Lots of changes all over, big internal header cleanup to make it clear
  drm features are legacy things and what are things that modern KMS
  drivers should be using.  Also big move to use the new generic fences
  in all the TTM drivers.

  core:
        atomic prep work,
        vblank rework changes, allows immediate vblank disables
        major header reworking and cleanups to better delinate legacy
        interfaces from what KMS drivers should be using.
        cursor planes locking fixes

  ttm:
        move to generic fences (affects all TTM drivers)
        ppc64 caching fixes

  radeon:
        userptr support,
        uvd for old asics,
        reset rework for fence changes
        better buffer placement changes,
        dpm feature enablement
        hdmi audio support fixes

  intel:
        Cherryview work,
        180 degree rotation,
        skylake prep work,
        execlist command submission
        full ppgtt prep work
        cursor improvements
        edid caching,
        vdd handling improvements

  nouveau:
        fence reworking
        kepler memory clock work
        gt21x clock work
        fan control improvements
        hdmi infoframe fixes
        DP audio

  ast:
        ppc64 fixes
        caching fix

  rcar:
        rcar-du DT support

  ipuv3:
        prep work for capture support

  msm:
        LVDS support for mdp4, new panel, gpu refactoring

  exynos:
        exynos3250 SoC support, drop bad mmap interface,
        mipi dsi changes, and component match support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
  drm/mst: rework payload table allocation to conform better.
  drm/ast: Fix HW cursor image
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/core: use helper to check driver features
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  ...
parents da92da36 dfda0df3

Documentation/DocBook/drm.tmpl

+14 −2
Original line number Diff line number Diff line
@@ -291,10 +291,9 @@ char *date;</synopsis> 
      <title>Device Registration</title>

      <para>

        A number of functions are provided to help with device registration.

        The functions deal with PCI, USB and platform devices, respectively.

        The functions deal with PCI and platform devices, respectively.

      </para>

!Edrivers/gpu/drm/drm_pci.c

!Edrivers/gpu/drm/drm_usb.c

!Edrivers/gpu/drm/drm_platform.c

      <para>

        New drivers that no longer rely on the services provided by the
@@ -3386,6 +3385,13 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
      by scheduling a timer. The delay is accessible through the vblankoffdelay

      module parameter or the <varname>drm_vblank_offdelay</varname> global

      variable and expressed in milliseconds. Its default value is 5000 ms.

      Zero means never disable, and a negative value means disable immediately.

      Drivers may override the behaviour by setting the

      <structname>drm_device</structname>

      <structfield>vblank_disable_immediate</structfield> flag, which when set

      causes vblank interrupts to be disabled immediately regardless of the

      drm_vblank_offdelay value. The flag should only be set if there's a

      properly working hardware vblank counter present.

    </para>

    <para>

      When a vertical blanking interrupt occurs drivers only need to call the
@@ -3400,6 +3406,7 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
    <sect2>

      <title>Vertical Blanking and Interrupt Handling Functions Reference</title>

!Edrivers/gpu/drm/drm_irq.c

!Finclude/drm/drmP.h drm_crtc_vblank_waitqueue

    </sect2>

  </sect1>
@@ -3918,6 +3925,11 @@ int num_ioctls;</synopsis> 
!Pdrivers/gpu/drm/i915/i915_cmd_parser.c batch buffer command parser

!Idrivers/gpu/drm/i915/i915_cmd_parser.c

      </sect2>

      <sect2>

        <title>Logical Rings, Logical Ring Contexts and Execlists</title>

!Pdrivers/gpu/drm/i915/intel_lrc.c Logical Rings, Logical Ring Contexts and Execlists

!Idrivers/gpu/drm/i915/intel_lrc.c

      </sect2>

    </sect1>

  </chapter>

</part>

Documentation/devicetree/bindings/drm/tilcdc/panel.txt

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ Required properties: 
   Documentation/devicetree/bindings/video/display-timing.txt for display

   timing binding details.



Optional properties:

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

- enable-gpios: GPIO pin to enable or disable the panel



Recommended properties:

 - pinctrl-names, pinctrl-0: the pincontrol settings to configure

   muxing properly for pins that connect to TFP410 device
@@ -29,6 +33,9 @@ Example: 
		compatible = "ti,tilcdc,panel";

		pinctrl-names = "default";

		pinctrl-0 = <&bone_lcd3_cape_lcd_pins>;

		backlight = <&backlight>;

		enable-gpios = <&gpio3 19 0>;



		panel-info {

			ac-bias           = <255>;

			ac-bias-intrpt    = <0>;

Documentation/devicetree/bindings/panel/auo,b101xtn01.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
AU Optronics Corporation 10.1" WXGA TFT LCD panel



Required properties:

- compatible: should be "auo,b101xtn01"



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

in simple-panel.txt in this directory.

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ maxim Maxim Integrated Products 
mediatek	MediaTek Inc.

micrel	Micrel Inc.

microchip	Microchip Technology Inc.

mitsubishi	Mitsubishi Electric Corporation

mosaixtech	Mosaix Technologies, Inc.

moxa	Moxa

mpl	MPL AG
@@ -144,6 +145,7 @@ st STMicroelectronics 
ste	ST-Ericsson

stericsson	ST-Ericsson

synology	Synology, Inc.

thine	THine Electronics, Inc.

ti	Texas Instruments

tlm	Trusted Logic Mobility

toradex	Toradex AG

Documentation/devicetree/bindings/video/adi,adv7123.txt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
Analog Device ADV7123 Video DAC

-------------------------------



The ADV7123 is a digital-to-analog converter that outputs VGA signals from a

parallel video input.



Required properties:



- compatible: Should be "adi,adv7123"



Optional properties:



- psave-gpios: Power save control GPIO



Required nodes:



The ADV7123 has two video ports. Their connections are modeled using the OF

graph bindings specified in Documentation/devicetree/bindings/graph.txt.



- Video port 0 for DPI input

- Video port 1 for VGA output





Example

-------



	adv7123: encoder@0 {

		compatible = "adi,adv7123";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				adv7123_in: endpoint@0 {

					remote-endpoint = <&dpi_out>;

				};

			};



			port@1 {

				reg = <1>;



				adv7123_out: endpoint@0 {

					remote-endpoint = <&vga_connector_in>;

				};

			};

		};

	};