[PATCH 0/4] drm/meson: power domain init related fixes

[PATCH 0/4] drm/meson: power domain init related fixes

[Neil Armstrong]

On the Amlogic Gx SoCs (GXBB, GXL & GXM), the VPU power domain is initialized
by the vendor U-Boot code, but running mainline U-boot has been possible
on these SoCs. But lacking such init made the system lock at kernel boot.

A PM Power Domain driver has been pushed at [1] to solve the main issue.
The following patches :
- updates the DT bindings accordingly
- adds support for missing regulators and registers init

Neil Armstrong (4):
  dt-bindings: display: amlogic,meson-vpu: Add optional power domain
    property
  dt-bindings: display: amlogic,meson-dw-hdmi: Add optional HDMI 5V
    regulator
  drm/meson: dw_hdmi: Add support for an optional external 5V regulator
  drm/meson: Add missing VPU init

 .../devicetree/bindings/display/amlogic,meson-dw-hdmi.txt   |  4 ++++
 .../devicetree/bindings/display/amlogic,meson-vpu.txt       |  4 ++++
 drivers/gpu/drm/meson/meson_drv.c                           |  9 +++++++++
 drivers/gpu/drm/meson/meson_dw_hdmi.c                       | 13 +++++++++++++
 drivers/gpu/drm/meson/meson_registers.h                     |  4 ++++
 5 files changed, 34 insertions(+)

-- 
2.7.4

[PATCH 1/4] dt-bindings: display: amlogic, meson-vpu: Add optional power domain property

[Neil Armstrong]

The Video Processing Unit power domain was setup by the Vendor U-Boot,
add support for an optional Power Domain phandle to setup it from the kernel.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
index 00f74ba..057b813 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt
@@ -64,6 +64,10 @@ Required properties:
 - reg-names: should contain the names of the previous memory regions
 - interrupts: should contain the VENC Vsync interrupt number
 
+Optional properties:
+- power-domains: Optional phandle to associated power domain as described in
+	the file ../power/power_domain.txt
+
 Required nodes:
 
 The connections to the VPU output video ports are modeled using the OF graph
-- 
2.7.4

[PATCH 1/4] dt-bindings: display: amlogic, meson-vpu: Add optional power domain property

[Rob Herring]

On Tue, Oct 17, 2017 at 10:07:41AM +0200, Neil Armstrong wrote:
> The Video Processing Unit power domain was setup by the Vendor U-Boot,
> add support for an optional Power Domain phandle to setup it from the kernel.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  Documentation/devicetree/bindings/display/amlogic,meson-vpu.txt | 4 ++++
>  1 file changed, 4 insertions(+)

Acked-by: Rob Herring <robh@kernel.org> 

[PATCH 2/4] dt-bindings: display: amlogic, meson-dw-hdmi: Add optional HDMI 5V regulator

[Neil Armstrong]

On reference boards and derivatives, the HDMI Logic is powered by an external
5V regulator.
This regulator was set by the Vendor U-Boot, add optional support for it.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
index 7f040ed..bf4a180 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
@@ -48,6 +48,10 @@ Required properties:
   Documentation/devicetree/bindings/reset/reset.txt,
   the reset-names should be "hdmitx_apb", "hdmitx", "hdmitx_phy"
 
+Optional properties:
+- hdmi-supply: Optional phandle to an external 5V regulator to power the HDMI
+  logic, as described in the file ../regulator/regulator.txt
+
 Required nodes:
 
 The connections to the HDMI ports are modeled using the OF graph
-- 
2.7.4

[PATCH 2/4] dt-bindings: display: amlogic, meson-dw-hdmi: Add optional HDMI 5V regulator

[Rob Herring]

On Tue, Oct 17, 2017 at 10:07:42AM +0200, Neil Armstrong wrote:
> On reference boards and derivatives, the HDMI Logic is powered by an external
> 5V regulator.
> This regulator was set by the Vendor U-Boot, add optional support for it.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> index 7f040ed..bf4a180 100644
> --- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> +++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> @@ -48,6 +48,10 @@ Required properties:
>    Documentation/devicetree/bindings/reset/reset.txt,
>    the reset-names should be "hdmitx_apb", "hdmitx", "hdmitx_phy"
>  
> +Optional properties:
> +- hdmi-supply: Optional phandle to an external 5V regulator to power the HDMI
> +  logic, as described in the file ../regulator/regulator.txt

5V into a modern SoC sounds strange. Is this really for the chip or for 
5V to the connector? The latter should be in the connector node.

Rob

[PATCH 2/4] dt-bindings: display: amlogic, meson-dw-hdmi: Add optional HDMI 5V regulator

[Neil Armstrong]

On 24/10/2017 00:46, Rob Herring wrote:
> On Tue, Oct 17, 2017 at 10:07:42AM +0200, Neil Armstrong wrote:
>> On reference boards and derivatives, the HDMI Logic is powered by an external
>> 5V regulator.
>> This regulator was set by the Vendor U-Boot, add optional support for it.
>>
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
>>  Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
>> index 7f040ed..bf4a180 100644
>> --- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
>> +++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
>> @@ -48,6 +48,10 @@ Required properties:
>>    Documentation/devicetree/bindings/reset/reset.txt,
>>    the reset-names should be "hdmitx_apb", "hdmitx", "hdmitx_phy"
>>  
>> +Optional properties:
>> +- hdmi-supply: Optional phandle to an external 5V regulator to power the HDMI
>> +  logic, as described in the file ../regulator/regulator.txt
> 
> 5V into a modern SoC sounds strange. Is this really for the chip or for 
> 5V to the connector? The latter should be in the connector node.
> 
> Rob
> 

Hi Rob,

The chip does not get the 5V but multiple derived voltages, but depends on the 5V regulator to
enable this power supply for the connector and to the hdmi io bank.

So in my opinion it's not related to the connector but to the HDMI logic.

Neil

[PATCH 2/4] dt-bindings: display: amlogic, meson-dw-hdmi: Add optional HDMI 5V regulator

[Rob Herring]

On Tue, Oct 24, 2017 at 10:09:15AM +0200, Neil Armstrong wrote:
> On 24/10/2017 00:46, Rob Herring wrote:
> > On Tue, Oct 17, 2017 at 10:07:42AM +0200, Neil Armstrong wrote:
> >> On reference boards and derivatives, the HDMI Logic is powered by an external
> >> 5V regulator.
> >> This regulator was set by the Vendor U-Boot, add optional support for it.
> >>
> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> >> ---
> >>  Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt | 4 ++++
> >>  1 file changed, 4 insertions(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> >> index 7f040ed..bf4a180 100644
> >> --- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> >> +++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt
> >> @@ -48,6 +48,10 @@ Required properties:
> >>    Documentation/devicetree/bindings/reset/reset.txt,
> >>    the reset-names should be "hdmitx_apb", "hdmitx", "hdmitx_phy"
> >>  
> >> +Optional properties:
> >> +- hdmi-supply: Optional phandle to an external 5V regulator to power the HDMI
> >> +  logic, as described in the file ../regulator/regulator.txt
> > 
> > 5V into a modern SoC sounds strange. Is this really for the chip or for 
> > 5V to the connector? The latter should be in the connector node.
> > 
> > Rob
> > 
> 
> Hi Rob,
> 
> The chip does not get the 5V but multiple derived voltages, but depends on the 5V regulator to
> enable this power supply for the connector and to the hdmi io bank.
> 
> So in my opinion it's not related to the connector but to the HDMI logic.

But you just said it is for the connector too.

In any case, if it is for the HDMI i/o, then

Acked-by: Rob Herring <robh@kernel.org>

[PATCH 3/4] drm/meson: dw_hdmi: Add support for an optional external 5V regulator

[Neil Armstrong]

On reference boards and derivatives, the HDMI Logic is powered by an external
5V regulator.
This regulator was set by the Vendor U-Boot, add optional support for it.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/gpu/drm/meson/meson_dw_hdmi.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
index cef4144..17de3af 100644
--- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
@@ -23,6 +23,7 @@
 #include <linux/of_graph.h>
 #include <linux/reset.h>
 #include <linux/clk.h>
+#include <linux/regulator/consumer.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_edid.h>
@@ -137,6 +138,7 @@ struct meson_dw_hdmi {
 	struct reset_control *hdmitx_phy;
 	struct clk *hdmi_pclk;
 	struct clk *venci_clk;
+	struct regulator *hdmi_supply;
 	u32 irq_stat;
 };
 #define encoder_to_meson_dw_hdmi(x) \
@@ -751,6 +753,17 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
 	dw_plat_data = &meson_dw_hdmi->dw_plat_data;
 	encoder = &meson_dw_hdmi->encoder;
 
+	meson_dw_hdmi->hdmi_supply = devm_regulator_get_optional(dev, "hdmi");
+	if (IS_ERR(meson_dw_hdmi->hdmi_supply)) {
+		if (PTR_ERR(meson_dw_hdmi->hdmi_supply) == -EPROBE_DEFER)
+			return -EPROBE_DEFER;
+		meson_dw_hdmi->hdmi_supply = NULL;
+	} else {
+		ret = regulator_enable(meson_dw_hdmi->hdmi_supply);
+		if (ret)
+			return ret;
+	}
+
 	meson_dw_hdmi->hdmitx_apb = devm_reset_control_get_exclusive(dev,
 						"hdmitx_apb");
 	if (IS_ERR(meson_dw_hdmi->hdmitx_apb)) {
-- 
2.7.4

[PATCH 4/4] drm/meson: Add missing VPU init

[Neil Armstrong]

The VPU init misses these configurations values.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/gpu/drm/meson/meson_drv.c       | 9 +++++++++
 drivers/gpu/drm/meson/meson_registers.h | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 7742c7d..19a0d8d 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -150,6 +150,14 @@ static struct regmap_config meson_regmap_config = {
 	.max_register   = 0x1000,
 };
 
+static void meson_vpu_init(struct meson_drm *priv)
+{
+	writel_relaxed(0x210000, priv->io_base + _REG(VPU_RDARB_MODE_L1C1));
+	writel_relaxed(0x10000, priv->io_base + _REG(VPU_RDARB_MODE_L1C2));
+	writel_relaxed(0x900000, priv->io_base + _REG(VPU_RDARB_MODE_L2C1));
+	writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1));
+}
+
 static int meson_drv_bind_master(struct device *dev, bool has_components)
 {
 	struct platform_device *pdev = to_platform_device(dev);
@@ -221,6 +229,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
 
 	/* Hardware Initialization */
 
+	meson_vpu_init(priv);
 	meson_venc_init(priv);
 	meson_vpp_init(priv);
 	meson_viu_init(priv);
diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
index 2847381..bca8714 100644
--- a/drivers/gpu/drm/meson/meson_registers.h
+++ b/drivers/gpu/drm/meson/meson_registers.h
@@ -1363,6 +1363,10 @@
 #define VPU_PROT3_STAT_1 0x277a
 #define VPU_PROT3_STAT_2 0x277b
 #define VPU_PROT3_REQ_ONOFF 0x277c
+#define VPU_RDARB_MODE_L1C1 0x2790
+#define VPU_RDARB_MODE_L1C2 0x2799
+#define VPU_RDARB_MODE_L2C1 0x279d
+#define VPU_WRARB_MODE_L2C1 0x27a2
 
 /* osd super scale */
 #define OSDSR_HV_SIZEIN 0x3130
-- 
2.7.4

[PATCH 0/4] drm/meson: power domain init related fixes

[Linus Lüssing]

On Tue, Oct 17, 2017 at 10:07:40AM +0200, Neil Armstrong wrote:
> A PM Power Domain driver has been pushed at [1] to solve the main issue.

URL to [1] missing?

[PATCH 0/4] drm/meson: power domain init related fixes

[Neil Armstrong]

On 17/10/2017 11:06, Linus L?ssing wrote:
> On Tue, Oct 17, 2017 at 10:07:40AM +0200, Neil Armstrong wrote:
>> A PM Power Domain driver has been pushed at [1] to solve the main issue.
> 
> URL to [1] missing?
> 

Sorry, here it is :
[1] https://lkml.kernel.org/r/1508228167-11753-1-git-send-email-narmstrong at baylibre.com