Commit 96b1b971 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm_kms_for_next-v8' of... 

Merge branch 'drm_kms_for_next-v8' of git://git.linaro.org/people/benjamin.gaignard/kernel into drm-next

This series of patches add the support of DRM/KMS drivers for STMicroelectronics
chipsets stih416 and stih407.

Hardware is split in two main blocks: Compositor and TVout. Each of them
includes specific hardware IPs and the display timing are controlled by a specific
Video Timing Generator hardware IP (VTG).

Compositor is made of the follow hardware IPs:
 - GDP (Generic Display Pipeline) which is an entry point for graphic (RGB)
   buffers
 - VDP (Video Diplay Pipeline) which is an entry point for video (YUV) buffers
 - HQVDP (High Quality Video Display Processor) that supports scaling,
   deinterlacing and some miscellaneous image quality improvements.
   It fetches the Video decoded buffers from memory, processes them and pushes
   them to the Compositor through a HW dedicated bus.
 - Mixer is responsible of mixing all the entries depending of their
   respective z-order and layout

TVout is divided in 3 parts:
 - HDMI to generate HDMI signals, depending of chipset version HDMI phy can
   change.
 - HDA to generate signals for HD analog TV
 - VIP to control/switch data path coming from Compositor

On stih416 compositor and Tvout are on different dies so a Video Trafic Advance
inter-die Communication mechanism (VTAC) is needed.

+---------------------------------------------+   +----------------------------------------+
| +-------------------------------+   +----+  |   |  +----+   +--------------------------+ |
| |                               |   |    |  |   |  |    |   |  +---------+     +----+  | |
| | +----+              +------+  |   |    |  |   |  |    |   |  | VIP     |---->|HDMI|  | |
| | |GPD +------------->|      |  |   |    |  |   |  |    |   |  |         |     +----+  | |
| | +----+              |Mixer |--|-->|    |  |   |  |    |---|->| switcher|             | |
| |                     |      |  |   |    |  |   |  |    |   |  |         |     +----+  | |
| |                     |      |  |   |    |  |   |  |    |   |  |         |---->|HDA |  | |
| |                     +------+  |   |VTAC|========>|VTAC|   |  +---------+     +----+  | |
| |                               |   |    |  |   |  |    |   |                          | |
| |         Compositor            |   |    |  |   |  |    |   |           TVout          | |
| +-------------------------------+   |    |  |   |  |    |   +--------------------------+ |
|                      ^              |    |  |   |  |    |             ^                  |
|                      |              |    |  |   |  |    |             |                  |
|               +--------------+      |    |  |   |  |    |      +-------------+           |
|               | VTG (master) |----->|    |  |   |  |    |----->| VTG (slave) |           |
|               +--------------+      +----+  |   |  +----+      +-------------+           |
|Digital die                                  |   |                              Analog Die|
+---------------------------------------------+   +----------------------------------------+

On stih407 Compositor and Tvout are on the same die

+-----------------------------------------------------------------+
| +-------------------------------+  +--------------------------+ |
| |                               |  |  +---------+     +----+  | |
| | +----+              +------+  |  |  | VIP     |---->|HDMI|  | |
| | |GPD +------------->|      |  |  |  |         |     +----+  | |
| | +----+              |Mixer |--|--|->| switcher|             | |
| | +----+   +-----+    |      |  |  |  |         |     +----+  | |
| | |VDP +-->+HQVDP+--->|      |  |  |  |         |---->|HDA |  | |
| | +----+   +-----+    +------+  |  |  +---------+     +----+  | |
| |                               |  |                          | |
| |         Compositor            |  |           TVout          | |
| +-------------------------------+  +--------------------------+ |
|                              ^        ^                         |
|                              |        |                         |
|                           +--------------+                      |
|                           |     VTG      |                      |
|                           +--------------+                      |
|Digital die                                                      |
+-----------------------------------------------------------------+

In addition of the drivers for the IPs listed before a thin I2C driver (hdmiddc) is used
by HDMI driver to retrieve EDID for monitor.

To unify interfaces of GDP and VDP we create a "layer" interface called by
compositor to control both GPD and VDP.

Hardware have memory contraints (alignment, contiguous) so we use CMA drm helpers functions
to allocate frame buffer.

File naming convention is:
 - sti_* for IPs drivers
 - sti_drm_* for drm functions implementation.

* 'drm_kms_for_next-v8' of git://git.linaro.org/people/benjamin.gaignard/kernel:
  drm: sti: Add DRM driver itself
  drm: sti: add Compositor
  drm: sti: add Mixer
  drm: sti: add VID layer
  drm: sti: add GDP layer
  drm: sti: add TVOut driver
  drm: sti: add HDA driver
  drm: sti: add HDMI driver
  drm: sti: add VTAC drivers
  drm: sti: add VTG driver
  drm: sti: add bindings for DRM driver
parents 920f9464 9bbf86fe

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

0 → 100644
+189 −0
Original line number Diff line number Diff line 
STMicroelectronics stih4xx platforms



- sti-vtg: video timing generator

  Required properties:

  - compatible: "st,vtg"

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

  Optional properties:

  - interrupts : VTG interrupt number to the CPU.

  - st,slave: phandle on a slave vtg



- sti-vtac: video timing advanced inter dye communication Rx and TX

  Required properties:

  - compatible: "st,vtac-main" or "st,vtac-aux"

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

  - clocks: from common clock binding: handle hardware IP needed clocks, the

    number of clocks may depend of the SoC type.

    See ../clocks/clock-bindings.txt for details.

  - clock-names: names of the clocks listed in clocks property in the same

    order.



- sti-display-subsystem: Master device for DRM sub-components

  This device must be the parent of all the sub-components and is responsible

  of bind them.

  Required properties:

  - compatible: "st,sti-display-subsystem"

  - ranges: to allow probing of subdevices



- sti-compositor: frame compositor engine

  must be a child of sti-display-subsystem

  Required properties:

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

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

  - clocks: from common clock binding: handle hardware IP needed clocks, the

    number of clocks may depend of the SoC type.

    See ../clocks/clock-bindings.txt for details.

  - clock-names: names of the clocks listed in clocks property in the same

    order.

  - resets: resets to be used by the device

    See ../reset/reset.txt for details.

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

    order.

  - st,vtg: phandle(s) on vtg device (main and aux) nodes.



- sti-tvout: video out hardware block

  must be a child of sti-display-subsystem

  Required properties:

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

  - 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

    the same order.

  - resets: resets to be used by the device

    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

  Required properties:

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

  - 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

    the same order.

  - interrupts : HDMI interrupt number to the CPU.

  - interrupt-names: name of the interrupts listed in interrupts property in

    the same order

  - clocks: from common clock binding: handle hardware IP needed clocks, the

    number of clocks may depend of the SoC type.

  - clock-names: names of the clocks listed in clocks property in the same

    order.

  - hdmi,hpd-gpio: gpio id to detect if an hdmi cable is plugged or not.



sti-hda:

  Required properties:

  must be a child of sti-tvout

  - 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

    the same order.

  - clocks: from common clock binding: handle hardware IP needed clocks, the

    number of clocks may depend of the SoC type.

    See ../clocks/clock-bindings.txt for details.

  - clock-names: names of the clocks listed in clocks property in the same

    order.



Example:



/ {

	...



	vtg_main_slave: sti-vtg-main-slave@fe85A800 {

		compatible	= "st,vtg";

		reg		= <0xfe85A800 0x300>;

		interrupts	= <GIC_SPI 175 IRQ_TYPE_NONE>;

	};



	vtg_main: sti-vtg-main-master@fd348000 {

		compatible	= "st,vtg";

		reg		= <0xfd348000 0x400>;

		st,slave	= <&vtg_main_slave>;

	};



	vtg_aux_slave: sti-vtg-aux-slave@fd348400 {

		compatible	= "st,vtg";

		reg		= <0xfe858200 0x300>;

		interrupts	= <GIC_SPI 176 IRQ_TYPE_NONE>;

	};



	vtg_aux: sti-vtg-aux-master@fd348400 {

		compatible	= "st,vtg";

		reg		= <0xfd348400 0x400>;

		st,slave	= <&vtg_aux_slave>;

	};





	sti-vtac-rx-main@fee82800 {

		compatible	= "st,vtac-main";

		reg		= <0xfee82800 0x200>;

		clock-names     = "vtac";

		clocks          = <&clk_m_a2_div0 CLK_M_VTAC_MAIN_PHY>;

	};



	sti-vtac-rx-aux@fee82a00 {

		compatible	= "st,vtac-aux";

		reg		= <0xfee82a00 0x200>;

		clock-names     = "vtac";

		clocks          = <&clk_m_a2_div0 CLK_M_VTAC_AUX_PHY>;

	};



	sti-vtac-tx-main@fd349000 {

		compatible	= "st,vtac-main";

		reg		= <0xfd349000 0x200>, <0xfd320000 0x10000>;

		clock-names     = "vtac";

		clocks           = <&clk_s_a1_hs CLK_S_VTAC_TX_PHY>;

	};



	sti-vtac-tx-aux@fd349200 {

		compatible	= "st,vtac-aux";

		reg		= <0xfd349200 0x200>, <0xfd320000 0x10000>;

		clock-names     = "vtac";

		clocks          = <&clk_s_a1_hs CLK_S_VTAC_TX_PHY>;

	};



	sti-display-subsystem {

		compatible = "st,sti-display-subsystem";

		ranges;



		sti-compositor@fd340000 {

			compatible	= "st,stih416-compositor";

			reg		= <0xfd340000 0x1000>;

			clock-names	= "compo_main", "compo_aux",

			                  "pix_main", "pix_aux";

			clocks          = <&clk_m_a2_div1 CLK_M_COMPO_MAIN>, <&clk_m_a2_div1 CLK_M_COMPO_AUX>,

					  <&clockgen_c_vcc CLK_S_PIX_MAIN>, <&clockgen_c_vcc CLK_S_PIX_AUX>;

			reset-names     = "compo-main", "compo-aux";

			resets          = <&softreset STIH416_COMPO_M_SOFTRESET>, <&softreset STIH416_COMPO_A_SOFTRESET>;

			st,vtg		= <&vtg_main>, <&vtg_aux>;

		};



		sti-tvout@fe000000 {

			compatible	= "st,stih416-tvout";

			reg		= <0xfe000000 0x1000>, <0xfe85a000 0x400>, <0xfe830000 0x10000>;

			reg-names	= "tvout-reg", "hda-reg", "syscfg";

			reset-names     = "tvout";

			resets          = <&softreset STIH416_HDTVOUT_SOFTRESET>;

			ranges;



			sti-hdmi@fe85c000 {

				compatible	= "st,stih416-hdmi";

				reg		= <0xfe85c000 0x1000>, <0xfe830000 0x10000>;

				reg-names	= "hdmi-reg", "syscfg";

				interrupts	= <GIC_SPI 173 IRQ_TYPE_NONE>;

				interrupt-names	= "irq";

				clock-names	= "pix", "tmds", "phy", "audio";

				clocks          = <&clockgen_c_vcc CLK_S_PIX_HDMI>, <&clockgen_c_vcc CLK_S_TMDS_HDMI>, <&clockgen_c_vcc CLK_S_HDMI_REJECT_PLL>, <&clockgen_b1 CLK_S_PCM_0>;

				hdmi,hpd-gpio	= <&PIO2 5>;

			};



			sti-hda@fe85a000 {

				compatible	= "st,stih416-hda";

				reg		= <0xfe85a000 0x400>, <0xfe83085c 0x4>;

				reg-names	= "hda-reg", "video-dacs-ctrl";

				clock-names	= "pix", "hddac";

				clocks          = <&clockgen_c_vcc CLK_S_PIX_HD>, <&clockgen_c_vcc CLK_S_HDDAC>;

			};

		};

	};

	...

};

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -201,3 +201,5 @@ source "drivers/gpu/drm/msm/Kconfig" 
source "drivers/gpu/drm/tegra/Kconfig"



source "drivers/gpu/drm/panel/Kconfig"



source "drivers/gpu/drm/sti/Kconfig"

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ obj-$(CONFIG_DRM_QXL) += qxl/ 
obj-$(CONFIG_DRM_BOCHS) += bochs/

obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_DRM_TEGRA) += tegra/

obj-$(CONFIG_DRM_STI) += sti/

obj-y			+= i2c/

obj-y			+= panel/

obj-y			+= bridge/

drivers/gpu/drm/sti/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
config DRM_STI

	tristate "DRM Support for STMicroelectronics SoC stiH41x Series"

	depends on DRM && (SOC_STIH415 || SOC_STIH416 || ARCH_MULTIPLATFORM)

	select DRM_KMS_HELPER

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_CMA_HELPER

	help

	  Choose this option to enable DRM on STM stiH41x chipset



config DRM_STI_FBDEV

	bool "DRM frame buffer device for STMicroelectronics SoC stiH41x Serie"

	depends on DRM_STI

	help

	  Choose this option to enable FBDEV on top of DRM for STM stiH41x chipset

drivers/gpu/drm/sti/Makefile

0 → 100644
+21 −0
Original line number Diff line number Diff line 
sticompositor-y := \

	sti_layer.o \

	sti_mixer.o \

	sti_gdp.o \

	sti_vid.o \

	sti_compositor.o \

	sti_drm_crtc.o \

	sti_drm_plane.o



stihdmi-y := sti_hdmi.o \

	sti_hdmi_tx3g0c55phy.o \

	sti_hdmi_tx3g4c28phy.o \



obj-$(CONFIG_DRM_STI) = \

	sti_vtg.o \

	sti_vtac.o \

	stihdmi.o \

	sti_hda.o \

	sti_tvout.o \

	sticompositor.o \

	sti_drm_drv.o
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE