Commit d00b39c1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next 

This pull request want to land the analogix_dp driver into drm/bridge directory,
which reused the Exynos DP code, and add Rockchip DP support. And those
patches have been:

* 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux:
  drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable time
  drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time
  drm: bridge: analogix/dp: add edid modes parse in get_modes method
  drm: bridge: analogix/dp: move hpd detect to connector detect function
  drm: bridge: analogix/dp: try force hpd after plug in lookup failed
  drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288
  drm: bridge: analogix/dp: add some rk3288 special registers setting
  dt-bindings: add document for rockchip variant of analogix_dp
  drm: rockchip: dp: add rockchip platform dp driver
  ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver
  dt-bindings: add document for analogix display port driver
  drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range
  drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count
  drm: bridge: analogix/dp: fix some obvious code style
  drm: bridge: analogix/dp: rename register constants
  drm/exynos: dp: rename implementation specific driver part
  drm: bridge: analogix/dp: split exynos dp driver to bridge directory
parents 85bd5ac3 7b4b7a8d

Documentation/devicetree/bindings/display/bridge/analogix_dp.txt

0 → 100644
+52 −0
Original line number Diff line number Diff line 
Analogix Display Port bridge bindings



Required properties for dp-controller:

	-compatible:

		platform specific such as:

		 * "samsung,exynos5-dp"

		 * "rockchip,rk3288-dp"

	-reg:

		physical base address of the controller and length

		of memory mapped region.

	-interrupts:

		interrupt combiner values.

	-clocks:

		from common clock binding: handle to dp clock.

	-clock-names:

		from common clock binding: Shall be "dp".

	-interrupt-parent:

		phandle to Interrupt combiner node.

	-phys:

		from general PHY binding: the phandle for the PHY device.

	-phy-names:

		from general PHY binding: Should be "dp".



Optional properties for dp-controller:

	-force-hpd:

		Indicate driver need force hpd when hpd detect failed, this

		is used for some eDP screen which don't have hpd signal.

	-hpd-gpios:

		Hotplug detect GPIO.

		Indicates which GPIO should be used for hotplug detection

	-port@[X]: SoC specific port nodes with endpoint definitions as defined

		in Documentation/devicetree/bindings/media/video-interfaces.txt,

		please refer to the SoC specific binding document:

		* Documentation/devicetree/bindings/display/exynos/exynos_dp.txt

		* Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt



[1]: Documentation/devicetree/bindings/media/video-interfaces.txt

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



Example:



	dp-controller {

		compatible = "samsung,exynos5-dp";

		reg = <0x145b0000 0x10000>;

		interrupts = <10 3>;

		interrupt-parent = <&combiner>;

		clocks = <&clock 342>;

		clock-names = "dp";



		phys = <&dp_phy>;

		phy-names = "dp";

	};

Documentation/devicetree/bindings/display/exynos/exynos_dp.txt

+27 −66
Original line number Diff line number Diff line 
Device-Tree bindings for Samsung Exynos Embedded DisplayPort Transmitter(eDP)



DisplayPort is industry standard to accommodate the growing board adoption

of digital display technology within the PC and CE industries.

It consolidates the internal and external connection methods to reduce device

complexity and cost. It also supports necessary features for important cross

industry applications and provides performance scalability to enable the next

generation of displays that feature higher color depths, refresh rates, and

display resolutions.



eDP (embedded display port) device is compliant with Embedded DisplayPort

standard as follows,

- DisplayPort standard 1.1a for Exynos5250 and Exynos5260.

- DisplayPort standard 1.3 for Exynos5422s and Exynos5800.



eDP resides between FIMD and panel or FIMD and bridge such as LVDS.



The Exynos display port interface should be configured based on

the type of panel connected to it.
@@ -48,26 +31,6 @@ Required properties for dp-controller: 
		from general PHY binding: the phandle for the PHY device.

	-phy-names:

		from general PHY binding: Should be "dp".

	-samsung,color-space:

		input video data format.

			COLOR_RGB = 0, COLOR_YCBCR422 = 1, COLOR_YCBCR444 = 2

	-samsung,dynamic-range:

		dynamic range for input video data.

			VESA = 0, CEA = 1

	-samsung,ycbcr-coeff:

		YCbCr co-efficients for input video.

			COLOR_YCBCR601 = 0, COLOR_YCBCR709 = 1

	-samsung,color-depth:

		number of bits per colour component.

			COLOR_6 = 0, COLOR_8 = 1, COLOR_10 = 2, COLOR_12 = 3

	-samsung,link-rate:

		link rate supported by the panel.

			LINK_RATE_1_62GBPS = 0x6, LINK_RATE_2_70GBPS = 0x0A

	-samsung,lane-count:

		number of lanes supported by the panel.

			LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4

	- display-timings: timings for the connected panel as described by

		Documentation/devicetree/bindings/display/display-timing.txt



Optional properties for dp-controller:

	-interlaced:
@@ -83,17 +46,31 @@ Optional properties for dp-controller: 
		Hotplug detect GPIO.

			Indicates which GPIO should be used for hotplug

			detection

Video interfaces:

  Device node can contain video interface port nodes according to [1].

  The following are properties specific to those nodes:



  endpoint node connected to bridge or panel node:

   - remote-endpoint: specifies the endpoint in panel or bridge node.

		      This node is required in all kinds of exynos dp

		      to represent the connection between dp and bridge

		      or dp and panel.



[1]: Documentation/devicetree/bindings/media/video-interfaces.txt

	-video interfaces: Device node can contain video interface port

			nodes according to [1].

	- display-timings: timings for the connected panel as described by

		Documentation/devicetree/bindings/display/panel/display-timing.txt



For the below properties, please refer to Analogix DP binding document:

 * Documentation/devicetree/bindings/display/bridge/analogix_dp.txt

	-phys (required)

	-phy-names (required)

	-hpd-gpios (optional)

	 force-hpd (optional)



Deprecated properties for DisplayPort:

-interlaced:            deprecated prop that can parsed from drm_display_mode.

-vsync-active-high:     deprecated prop that can parsed from drm_display_mode.

-hsync-active-high:     deprecated prop that can parsed from drm_display_mode.

-samsung,ycbcr-coeff:   deprecated prop that can parsed from drm_display_mode.

-samsung,dynamic-range: deprecated prop that can parsed from drm_display_mode.

-samsung,color-space:   deprecated prop that can parsed from drm_display_info.

-samsung,color-depth:   deprecated prop that can parsed from drm_display_info.

-samsung,link-rate:     deprecated prop that can reading from monitor by dpcd method.

-samsung,lane-count:    deprecated prop that can reading from monitor by dpcd method.

-samsung,hpd-gpio:      deprecated name for hpd-gpios.



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



Example:
@@ -112,13 +89,6 @@ SOC specific portion: 


Board Specific portion:

	dp-controller {

		samsung,color-space = <0>;

		samsung,dynamic-range = <0>;

		samsung,ycbcr-coeff = <0>;

		samsung,color-depth = <1>;

		samsung,link-rate = <0x0a>;

		samsung,lane-count = <4>;



		display-timings {

			native-mode = <&lcd_timing>;

			lcd_timing: 1366x768 {
@@ -135,18 +105,9 @@ Board Specific portion: 
		};



		ports {

			port {

			port@0 {

				dp_out: endpoint {

					remote-endpoint = <&dp_in>;

				};

			};

		};



		panel {

			...

			port {

				dp_in: endpoint {

					remote-endpoint = <&dp_out>;

					remote-endpoint = <&bridge_in>;

				};

			};

		};

Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt

0 → 100644
+92 −0
Original line number Diff line number Diff line 
Rockchip RK3288 specific extensions to the Analogix Display Port

================================



Required properties:

- compatible: "rockchip,rk3288-edp";



- reg: physical base address of the controller and length



- clocks: from common clock binding: handle to dp clock.

	  of memory mapped region.



- clock-names: from common clock binding:

	       Required elements: "dp" "pclk"



- resets: Must contain an entry for each entry in reset-names.

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



- pinctrl-names: Names corresponding to the chip hotplug pinctrl states.

- pinctrl-0: pin-control mode. should be <&edp_hpd>



- reset-names: Must include the name "dp"



- rockchip,grf: this soc should set GRF regs, so need get grf here.



- ports: there are 2 port nodes with endpoint definitions as defined in

  Documentation/devicetree/bindings/media/video-interfaces.txt.

    Port 0: contained 2 endpoints, connecting to the output of vop.

    Port 1: contained 1 endpoint, connecting to the input of panel.



For the below properties, please refer to Analogix DP binding document:

 * Documentation/devicetree/bindings/drm/bridge/analogix_dp.txt

- phys (required)

- phy-names (required)

- hpd-gpios (optional)

- force-hpd (optional)

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



Example:

	dp-controller: dp@ff970000 {

		compatible = "rockchip,rk3288-dp";

		reg = <0xff970000 0x4000>;

		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>;

		clock-names = "dp", "pclk";

		phys = <&dp_phy>;

		phy-names = "dp";



		rockchip,grf = <&grf>;

		resets = <&cru 111>;

		reset-names = "dp";



		pinctrl-names = "default";

		pinctrl-0 = <&edp_hpd>;



		status = "disabled";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;

			edp_in: port@0 {

				reg = <0>;

				#address-cells = <1>;

				#size-cells = <0>;

				edp_in_vopb: endpoint@0 {

					reg = <0>;

					remote-endpoint = <&vopb_out_edp>;

				};

				edp_in_vopl: endpoint@1 {

					reg = <1>;

					remote-endpoint = <&vopl_out_edp>;

				};

			};



			edp_out: port@1 {

				reg = <1>;

				#address-cells = <1>;

				#size-cells = <0>;

				edp_out_panel: endpoint {

					reg = <0>;

					remote-endpoint = <&panel_in_edp>

				};

			};

		};

	};



	pinctrl {

		edp {

			edp_hpd: edp-hpd {

				rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_none>;

			};

		};

	};

arch/arm/boot/dts/exynos5250-arndale.dts

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ 
&dp {

	status = "okay";

	samsung,color-space = <0>;

	samsung,dynamic-range = <0>;

	samsung,ycbcr-coeff = <0>;

	samsung,color-depth = <1>;

	samsung,link-rate = <0x0a>;

	samsung,lane-count = <4>;

arch/arm/boot/dts/exynos5250-smdk5250.dts

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ 


&dp {

	samsung,color-space = <0>;

	samsung,dynamic-range = <0>;

	samsung,ycbcr-coeff = <0>;

	samsung,color-depth = <1>;

	samsung,link-rate = <0x0a>;

	samsung,lane-count = <4>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE