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

Commit f377ea88 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 pull request for the drm for 4.3.  Nouveau is
  probably the biggest amount of changes in here, since it missed 4.2.
  Highlights below, along with the usual bunch of fixes.

  All stuff outside drm should have applicable acks.

  Highlights:

   - new drivers:
        freescale dcu kms driver

   - core:
        more atomic fixes
        disable some dri1 interfaces on kms drivers
        drop fb panic handling, this was just getting more broken, as more locking was required.
        new core fbdev Kconfig support - instead of each driver enable/disabling it
        struct_mutex cleanups

   - panel:
        more new panels
        cleanup Kconfig

   - i915:
        Skylake support enabled by default
        legacy modesetting using atomic infrastructure
        Skylake fixes
        GEN9 workarounds

   - amdgpu:
        Fiji support
        CGS support for amdgpu
        Initial GPU scheduler - off by default
        Lots of bug fixes and optimisations.

   - radeon:
        DP fixes
        misc fixes

   - amdkfd:
        Add Carrizo support for amdkfd using amdgpu.

   - nouveau:
        long pending cleanup to complete driver,
        fully bisectable which makes it larger,
        perfmon work
        more reclocking improvements
        maxwell displayport fixes

   - vmwgfx:
        new DX device support, supports OpenGL 3.3
        screen targets support

   - mgag200:
        G200eW support
        G200e new revision support

   - msm:
        dragonboard 410c support, msm8x94 support, msm8x74v1 support
        yuv format support
        dma plane support
        mdp5 rotation
        initial hdcp

   - sti:
        atomic support

   - exynos:
        lots of cleanups
        atomic modesetting/pageflipping support
        render node support

   - tegra:
        tegra210 support (dc, dsi, dp/hdmi)
        dpms with atomic modesetting support

   - atmel:
        support for 3 more atmel SoCs
        new input formats, PRIME support.

   - dwhdmi:
        preparing to add audio support

   - rockchip:
        yuv plane support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (1369 commits)
  drm/amdgpu: rename gmc_v8_0_init_compute_vmid
  drm/amdgpu: fix vce3 instance handling
  drm/amdgpu: remove ib test for the second VCE Ring
  drm/amdgpu: properly enable VM fault interrupts
  drm/amdgpu: fix warning in scheduler
  drm/amdgpu: fix buffer placement under memory pressure
  drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic
  drm/amdgpu: fix typo in dce11 watermark setup
  drm/amdgpu: fix typo in dce10 watermark setup
  drm/amdgpu: use top down allocation for non-CPU accessible vram
  drm/amdgpu: be explicit about cpu vram access for driver BOs (v2)
  drm/amdgpu: set MEC doorbell range for Fiji
  drm/amdgpu: implement burst NOP for SDMA
  drm/amdgpu: add insert_nop ring func and default implementation
  drm/amdgpu: add amdgpu_get_sdma_instance helper function
  drm/amdgpu: add AMDGPU_MAX_SDMA_INSTANCES
  drm/amdgpu: add burst_nop flag for sdma
  drm/amdgpu: add count field for the SDMA NOP packet v2
  drm/amdgpu: use PT for VM sync on unmap
  drm/amdgpu: make wait_event uninterruptible in push_job
  ...
parents 51e771c0 73bf1b7b

Documentation/DocBook/drm.tmpl

+22 −2
Original line number Diff line number Diff line
@@ -3982,7 +3982,6 @@ int num_ioctls;</synopsis> 
        <title>Interrupt Handling</title>

!Pdrivers/gpu/drm/i915/i915_irq.c interrupt handling

!Fdrivers/gpu/drm/i915/i915_irq.c intel_irq_init intel_irq_init_hw intel_hpd_init

!Fdrivers/gpu/drm/i915/i915_irq.c intel_irq_fini

!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_disable_interrupts

!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_enable_interrupts

      </sect2>
@@ -4012,7 +4011,6 @@ int num_ioctls;</synopsis> 
        <title>Frontbuffer Tracking</title>

!Pdrivers/gpu/drm/i915/intel_frontbuffer.c frontbuffer tracking

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

!Fdrivers/gpu/drm/i915/intel_drv.h intel_frontbuffer_flip

!Fdrivers/gpu/drm/i915/i915_gem.c i915_gem_track_fb

      </sect2>

      <sect2>
@@ -4044,6 +4042,11 @@ int num_ioctls;</synopsis> 
	  probing, so those sections fully apply.

        </para>

      </sect2>

      <sect2>

        <title>Hotplug</title>

!Pdrivers/gpu/drm/i915/intel_hotplug.c Hotplug

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

      </sect2>

      <sect2>

	<title>High Definition Audio</title>

!Pdrivers/gpu/drm/i915/intel_audio.c High Definition Audio over HDMI and Display Port
@@ -4193,6 +4196,23 @@ int num_ioctls;</synopsis> 
        <title>Global GTT views</title>

!Pdrivers/gpu/drm/i915/i915_gem_gtt.c Global GTT views

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

      </sect2>

      <sect2>

        <title>GTT Fences and Swizzling</title>

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

        <sect3>

          <title>Global GTT Fence Handling</title>

!Pdrivers/gpu/drm/i915/i915_gem_fence.c fence register handling

        </sect3>

        <sect3>

          <title>Hardware Tiling and Swizzling Details</title>

!Pdrivers/gpu/drm/i915/i915_gem_fence.c tiling swizzling details

        </sect3>

      </sect2>

      <sect2>

        <title>Object Tiling IOCTLs</title>

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

!Pdrivers/gpu/drm/i915/i915_gem_tiling.c buffer object tiling

      </sect2>

      <sect2>

        <title>Buffer Object Eviction</title>

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

+35 −6
Original line number Diff line number Diff line
@@ -30,20 +30,27 @@ Optional properties: 
- panel@0: Node of panel connected to this DSI controller.

  See files in Documentation/devicetree/bindings/panel/ for each supported

  panel.

- qcom,dual-panel-mode: Boolean value indicating if the DSI controller is

- qcom,dual-dsi-mode: Boolean value indicating if the DSI controller is

  driving a panel which needs 2 DSI links.

- qcom,master-panel: Boolean value indicating if the DSI controller is driving

- qcom,master-dsi: Boolean value indicating if the DSI controller is driving

  the master link of the 2-DSI panel.

- qcom,sync-dual-panel: Boolean value indicating if the DSI controller is

- qcom,sync-dual-dsi: Boolean value indicating if the DSI controller is

  driving a 2-DSI panel whose 2 links need receive command simultaneously.

- interrupt-parent: phandle to the MDP block if the interrupt signal is routed

  through MDP block

- pinctrl-names: the pin control state names; should contain "default"

- pinctrl-0: the default pinctrl state (active)

- pinctrl-n: the "sleep" pinctrl state

- port: DSI controller output port. This contains one endpoint subnode, with its

  remote-endpoint set to the phandle of the connected panel's endpoint.

  See Documentation/devicetree/bindings/graph.txt for device graph info.



DSI PHY:

Required properties:

- compatible: Could be the following

  * "qcom,dsi-phy-28nm-hpm"

  * "qcom,dsi-phy-28nm-lp"

  * "qcom,dsi-phy-20nm"

- reg: Physical base address and length of the registers of PLL, PHY and PHY

  regulator

- reg-names: The names of register regions. The following regions are required:
@@ -59,6 +66,10 @@ Required properties: 
  * "iface_clk"

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



Optional properties:

- qcom,dsi-phy-regulator-ldo-mode: Boolean value indicating if the LDO mode PHY

  regulator is wanted.



Example:

	mdss_dsi0: qcom,mdss_dsi@fd922800 {

		compatible = "qcom,mdss-dsi-ctrl";
@@ -90,9 +101,13 @@ Example: 


		qcom,dsi-phy = <&mdss_dsi_phy0>;



		qcom,dual-panel-mode;

		qcom,master-panel;

		qcom,sync-dual-panel;

		qcom,dual-dsi-mode;

		qcom,master-dsi;

		qcom,sync-dual-dsi;



		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&mdss_dsi_active>;

		pinctrl-1 = <&mdss_dsi_suspend>;



		panel: panel@0 {

			compatible = "sharp,lq101r1sx01";
@@ -101,6 +116,18 @@ Example: 


			power-supply = <...>;

			backlight = <...>;



			port {

				panel_in: endpoint {

					remote-endpoint = <&dsi0_out>;

				};

			};

		};



		port {

			dsi0_out: endpoint {

				remote-endpoint = <&panel_in>;

			};

		};

	};
@@ -117,4 +144,6 @@ Example: 
		clock-names = "iface_clk";

		clocks = <&mmcc MDSS_AHB_CLK>;

		vddio-supply = <&pma8084_l12>;



		qcom,dsi-phy-regulator-ldo-mode;

	};

Documentation/devicetree/bindings/drm/msm/hdmi.txt

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ Qualcomm adreno/snapdragon hdmi output 


Required properties:

- compatible: one of the following

   * "qcom,hdmi-tx-8994"

   * "qcom,hdmi-tx-8084"

   * "qcom,hdmi-tx-8074"

   * "qcom,hdmi-tx-8974"

   * "qcom,hdmi-tx-8660"

   * "qcom,hdmi-tx-8960"

- reg: Physical base address and length of the controller's registers

Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

+5 −3
Original line number Diff line number Diff line
@@ -197,9 +197,11 @@ of the following host1x client modules: 
- sor: serial output resource



  Required properties:

  - compatible: For Tegra124, must contain "nvidia,tegra124-sor".  Otherwise,

    must contain '"nvidia,<chip>-sor", "nvidia,tegra124-sor"', where <chip>

    is tegra132.

  - compatible: Should be:

    - "nvidia,tegra124-sor": for Tegra124 and Tegra132

    - "nvidia,tegra132-sor": for Tegra132

    - "nvidia,tegra210-sor": for Tegra210

    - "nvidia,tegra210-sor1": for Tegra210

  - reg: Physical base address and length of the controller's registers.

  - interrupts: The interrupt outputs from the controller.

  - clocks: Must contain an entry for each entry in clock-names.

Documentation/devicetree/bindings/gpu/st,stih4xx.txt

+35 −37
Original line number Diff line number Diff line
@@ -52,10 +52,9 @@ STMicroelectronics stih4xx platforms 
    See ../reset/reset.txt for details.

  - reset-names: names of the resets listed in resets property in the same

    order.

  - ranges: to allow probing of subdevices



- sti-hdmi: hdmi output block

  must be a child of sti-tvout

  must be a child of sti-display-subsystem

  Required properties:

  - compatible: "st,stih<chip>-hdmi";

  - reg: Physical base address of the IP registers and length of memory mapped region.
@@ -72,7 +71,7 @@ STMicroelectronics stih4xx platforms 


sti-hda:

  Required properties:

  must be a child of sti-tvout

  must be a child of sti-display-subsystem

  - compatible: "st,stih<chip>-hda"

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

  - reg-names: names of the mapped memory regions listed in regs property in
@@ -85,7 +84,7 @@ sti-hda: 


sti-dvo:

  Required properties:

  must be a child of sti-tvout

  must be a child of sti-display-subsystem

  - compatible: "st,stih<chip>-dvo"

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

  - reg-names: names of the mapped memory regions listed in regs property in
@@ -195,7 +194,7 @@ Example: 
			reg-names	= "tvout-reg", "hda-reg", "syscfg";

			reset-names     = "tvout";

			resets          = <&softreset STIH416_HDTVOUT_SOFTRESET>;

			ranges;

		};



		sti-hdmi@fe85c000 {

			compatible	= "st,stih416-hdmi";
@@ -227,7 +226,6 @@ Example: 
			pinctrl-0	= <&pinctrl_dvo>;

			sti,panel	= <&panel_dvo>;

		};

		};



		sti-hqvdp@9c000000 {

				compatible	= "st,stih407-hqvdp";