dt-bindings: display: tegra: Support SOR crossbar configuration
Subsystems (5)
PATCH 1/2 dt-bindings: display: tegra: Support SOR crossbar configuration
From: Thierry Reding <[email protected]>
The SOR has a crossbar that can map each lane of the SOR to each of the SOR pads. The mapping is usually the same across designs for a specific SoC generation, but every now and then there's a design that doesn't.
Allow the crossbar configuration to be specified in device tree to make it possible to support these designs.
--- .../bindings/display/tegra/nvidia,tegra20-host1x.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt +3 -0
@@ -238,6 +238,9 @@ of the following host1x client modules: - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection - nvidia,edid: supplies a binary EDID blob - nvidia,panel: phandle of a display panel + - nvidia,xbar-cfg: 5 cells containing the crossbar configuration. Each lane + of the SOR, identified by the cell's index, is mapped via the crossbar to + the pad specified by the cell's value. Optional properties when driving an eDP output: - nvidia,dpaux: phandle to a DispayPort AUX interface
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/tegra: sor: Support device tree crossbar configuration
From: Thierry Reding <[email protected]>
The crossbar configuration is usually the same across all designs for a given SoC generation. But sometimes there are designs that require some other configuration.
Implement support for parsing the crossbar configuration from a device tree. If the crossbar configuration is not present in the device tree, fall back to the default crossbar configuration.
--- drivers/gpu/drm/tegra/sor.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/gpu/drm/tegra/sor.c +17 -2
@@ -410,6 +410,8 @@ struct tegra_sor {struct clk *clk_dp;struct clk *clk; +u8 xbar_cfg[5 ]; +struct drm_dp_aux *aux;struct drm_info_list *debugfs_files;
@@ -1814,7 +1816,7 @@ static void tegra_sor_edp_enable(struct drm_encoder *encoder)/* XXX not in TRM */ for (value =0 , i =0 ; i <5 ; i++) - value |=SOR_XBAR_CTRL_LINK0_XSEL (i, sor->soc->xbar_cfg[i]) | + value |=SOR_XBAR_CTRL_LINK0_XSEL (i, sor->xbar_cfg[i]) |SOR_XBAR_CTRL_LINK1_XSEL (i, i);tegra_sor_writel (sor,0x00000000 ,SOR_XBAR_POL );
@@ -2551,7 +2553,7 @@ static void tegra_sor_hdmi_enable(struct drm_encoder *encoder)/* XXX not in TRM */ for (value =0 , i =0 ; i <5 ; i++) - value |=SOR_XBAR_CTRL_LINK0_XSEL (i, sor->soc->xbar_cfg[i]) | + value |=SOR_XBAR_CTRL_LINK0_XSEL (i, sor->xbar_cfg[i]) |SOR_XBAR_CTRL_LINK1_XSEL (i, i);tegra_sor_writel (sor,0x00000000 ,SOR_XBAR_POL );
@@ -3172,6 +3174,8 @@ MODULE_DEVICE_TABLE(of, tegra_sor_of_match);static int tegra_sor_parse_dt (struct tegra_sor *sor) {struct device_node *np = sor->dev->of_node; +u32 xbar_cfg[5 ]; +unsigned int i;u32 value;int err;
@@ -3189,6 +3193,17 @@ static int tegra_sor_parse_dt(struct tegra_sor *sor) sor->pad =TEGRA_IO_PAD_HDMI_DP0 + sor->index; } + err =of_property_read_u32_array (np,"nvidia,xbar-cfg" , xbar_cfg,5 ); +if (err <0 ) { +/* fall back to default per-SoC XBAR configuration */ +for (i =0 ; i <5 ; i++) + sor->xbar_cfg[i] = sor->soc->xbar_cfg[i]; + }else { +/* copy cells to SOR XBAR configuration */ +for (i =0 ; i <5 ; i++) + sor->xbar_cfg[i] = xbar_cfg[i]; + } +return 0 ; }
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The SOR has a crossbar that can map each lane of the SOR to each of the SOR pads. The mapping is usually the same across designs for a specific SoC generation, but every now and then there's a design that doesn't.
Quoted 7 lines
Allow the crossbar configuration to be specified in device tree to make it possible to support these designs.
Signed-off-by Thierry Reding <[email protected]>--- .../bindings/display/tegra/nvidia,tegra20-host1x.txt | 3 +++ 1 file changed, 3 insertions(+)
Hi Rob,
any comments on this?
Thanks,
Thierry
Quoted 17 lines
Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt +3
-0@@ -238,6 +238,9 @@ of the following host1x client modules: - nvidia,hpd-gpio: specifies a GPIO used for hotplug detection - nvidia,edid: supplies a binary EDID blob - nvidia,panel: phandle of a display panel + - nvidia,xbar-cfg: 5 cells containing the crossbar configuration. Each lane + of the SOR, identified by the cell's index, is mapped via the crossbar to + the pad specified by the cell's value. Optional properties when driving an eDP output: - nvidia,dpaux: phandle to a DispayPort AUX interfaceSignature · 1 line
2.19.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel