[PATCH v4 1/4] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I

[PATCH v4 1/4] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I

[Jagan Teki]

Allwinner SoC like SUN8I and SUN50I has DE2 CCU so enable them
as default.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v4, v3:
- none
Changes for v2:
- Enable for MACH_SUN8I

 drivers/clk/sunxi-ng/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
index 826674d090fd..e20182aa9748 100644
--- a/drivers/clk/sunxi-ng/Kconfig
+++ b/drivers/clk/sunxi-ng/Kconfig
@@ -63,6 +63,8 @@ config SUN8I_V3S_CCU
 
 config SUN8I_DE2_CCU
 	bool "Support for the Allwinner SoCs DE2 CCU"
+	default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
+	depends on DRM_SUN4I && (MACH_SUN8I || (ARM64 && ARCH_SUNXI))
 
 config SUN8I_R40_CCU
 	bool "Support for the Allwinner R40 CCU"
-- 
2.18.0.321.gffc6fa0e3

[PATCH v4 2/4] arm64: defconfig: Enable CONFIG_DRM_SUN4I

[Jagan Teki]

Enable DRM Support for Allwinner Display Engine, built as a module.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v4, v3, v2:
- none

 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f67e8d5e93ad..4919e4577548 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -433,6 +433,7 @@ CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_DRM_SUN4I=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
-- 
2.18.0.321.gffc6fa0e3

Re: [PATCH v4 2/4] arm64: defconfig: Enable CONFIG_DRM_SUN4I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

On Tue, Sep 04, 2018 at 10:06:07PM +0530, Jagan Teki wrote:
> Enable DRM Support for Allwinner Display Engine, built as a module.
> 
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Applied, thanks!
Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH v4 3/4] drm/sun4i: Enable DE2 Mixer for SUN8I and SUN50I

[Jagan Teki]

Allwinner SoC like SUN8I and SUN50I are now using DE2 Mixer
so enable them as default.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v4, v3:
- none
Changes for v2:
- Enable for SUN8I

 drivers/gpu/drm/sun4i/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index c2c042287c19..cfa8b96273fb 100644
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -61,7 +61,7 @@ config DRM_SUN8I_DW_HDMI
 
 config DRM_SUN8I_MIXER
 	tristate "Support for Allwinner Display Engine 2.0 Mixer"
-	default MACH_SUN8I
+	default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
 	help
 	  Choose this option if you have an Allwinner SoC with the
 	  Allwinner Display Engine 2.0, which has a mixer to do some
-- 
2.18.0.321.gffc6fa0e3

Re: [PATCH v4 3/4] drm/sun4i: Enable DE2 Mixer for SUN8I and SUN50I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]

On Tue, Sep 04, 2018 at 10:06:08PM +0530, Jagan Teki wrote:
> Allwinner SoC like SUN8I and SUN50I are now using DE2 Mixer
> so enable them as default.
> 
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v4, v3:
> - none
> Changes for v2:
> - Enable for SUN8I
> 
>  drivers/gpu/drm/sun4i/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
> index c2c042287c19..cfa8b96273fb 100644
> --- a/drivers/gpu/drm/sun4i/Kconfig
> +++ b/drivers/gpu/drm/sun4i/Kconfig
> @@ -61,7 +61,7 @@ config DRM_SUN8I_DW_HDMI
>  
>  config DRM_SUN8I_MIXER
>  	tristate "Support for Allwinner Display Engine 2.0 Mixer"
> -	default MACH_SUN8I
> +	default MACH_SUN8I || (ARM64 && ARCH_SUNXI)

I'm not really sure we should put it as a default. We should just
enable it in the defconfig.

Maxime

>  	help
>  	  Choose this option if you have an Allwinner SoC with the
>  	  Allwinner Display Engine 2.0, which has a mixer to do some
> -- 
> 2.18.0.321.gffc6fa0e3
> 

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v4 3/4] drm/sun4i: Enable DE2 Mixer for SUN8I and SUN50I

[Jagan Teki]

On Wed, Sep 5, 2018 at 12:37 PM, Maxime Ripard
<maxime.ripard@bootlin.com> wrote:
> On Tue, Sep 04, 2018 at 10:06:08PM +0530, Jagan Teki wrote:
>> Allwinner SoC like SUN8I and SUN50I are now using DE2 Mixer
>> so enable them as default.
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>> ---
>> Changes for v4, v3:
>> - none
>> Changes for v2:
>> - Enable for SUN8I
>>
>>  drivers/gpu/drm/sun4i/Kconfig | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
>> index c2c042287c19..cfa8b96273fb 100644
>> --- a/drivers/gpu/drm/sun4i/Kconfig
>> +++ b/drivers/gpu/drm/sun4i/Kconfig
>> @@ -61,7 +61,7 @@ config DRM_SUN8I_DW_HDMI
>>
>>  config DRM_SUN8I_MIXER
>>       tristate "Support for Allwinner Display Engine 2.0 Mixer"
>> -     default MACH_SUN8I
>> +     default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
>
> I'm not really sure we should put it as a default. We should just
> enable it in the defconfig.

What would be the difference in both cases it would be build as module
since DRM_SUN4I=m for ARM64

Re: [PATCH v4 3/4] drm/sun4i: Enable DE2 Mixer for SUN8I and SUN50I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]

On Wed, Sep 05, 2018 at 01:51:25PM +0530, Jagan Teki wrote:
> On Wed, Sep 5, 2018 at 12:37 PM, Maxime Ripard
> <maxime.ripard@bootlin.com> wrote:
> > On Tue, Sep 04, 2018 at 10:06:08PM +0530, Jagan Teki wrote:
> >> Allwinner SoC like SUN8I and SUN50I are now using DE2 Mixer
> >> so enable them as default.
> >>
> >> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> >> ---
> >> Changes for v4, v3:
> >> - none
> >> Changes for v2:
> >> - Enable for SUN8I
> >>
> >>  drivers/gpu/drm/sun4i/Kconfig | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
> >> index c2c042287c19..cfa8b96273fb 100644
> >> --- a/drivers/gpu/drm/sun4i/Kconfig
> >> +++ b/drivers/gpu/drm/sun4i/Kconfig
> >> @@ -61,7 +61,7 @@ config DRM_SUN8I_DW_HDMI
> >>
> >>  config DRM_SUN8I_MIXER
> >>       tristate "Support for Allwinner Display Engine 2.0 Mixer"
> >> -     default MACH_SUN8I
> >> +     default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
> >
> > I'm not really sure we should put it as a default. We should just
> > enable it in the defconfig.
> 
> What would be the difference in both cases it would be build as module
> since DRM_SUN4I=m for ARM64

We wouldn't force it down the throat to every user by default, even
though they have no interest in that driver being compiled into their
kernel.

Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH v4 4/4] drm/sun4i: Enable DesignWare HDMI for SUN50I

[Jagan Teki]

Allwinner SUN50I are now using DesignWare HDMI so enable
them as default. This can build DRM_SUN8I_DW_HDMI as module
since DRM in arm64 has module.

Making this as defult to SUN8I, may cause an issue while
loading since arm32 DRM built as static.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v4:
- none
Changes for v3:
- skip SUN8I enablement, since it built statically for arm32
Changes for v2:
- Enable for SUN8I

 drivers/gpu/drm/sun4i/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index cfa8b96273fb..5d0c450db148 100644
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -52,6 +52,7 @@ config DRM_SUN6I_DSI
 
 config DRM_SUN8I_DW_HDMI
 	tristate "Support for Allwinner version of DesignWare HDMI"
+	default ARM64 && ARCH_SUNXI
 	depends on DRM_SUN4I
 	select DRM_DW_HDMI
 	help
-- 
2.18.0.321.gffc6fa0e3

Re: [PATCH v4 4/4] drm/sun4i: Enable DesignWare HDMI for SUN50I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

On Tue, Sep 04, 2018 at 10:06:09PM +0530, Jagan Teki wrote:
> Allwinner SUN50I are now using DesignWare HDMI so enable
> them as default. This can build DRM_SUN8I_DW_HDMI as module
> since DRM in arm64 has module.
> 
> Making this as defult to SUN8I, may cause an issue while
> loading since arm32 DRM built as static.

Uh? Why? We should fix this instead of working around it.

Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v4 4/4] drm/sun4i: Enable DesignWare HDMI for SUN50I

[Jagan Teki]

On Wed, Sep 5, 2018 at 12:38 PM, Maxime Ripard
<maxime.ripard@bootlin.com> wrote:
> On Tue, Sep 04, 2018 at 10:06:09PM +0530, Jagan Teki wrote:
>> Allwinner SUN50I are now using DesignWare HDMI so enable
>> them as default. This can build DRM_SUN8I_DW_HDMI as module
>> since DRM in arm64 has module.
>>
>> Making this as defult to SUN8I, may cause an issue while
>> loading since arm32 DRM built as static.
>
> Uh? Why? We should fix this instead of working around it.

I didn't dig further on this. Since ARM64 has is fine with it both
(module and static) may be we can take this.

Re: [PATCH v4 4/4] drm/sun4i: Enable DesignWare HDMI for SUN50I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 858 bytes --]

On Wed, Sep 05, 2018 at 01:54:42PM +0530, Jagan Teki wrote:
> On Wed, Sep 5, 2018 at 12:38 PM, Maxime Ripard
> <maxime.ripard@bootlin.com> wrote:
> > On Tue, Sep 04, 2018 at 10:06:09PM +0530, Jagan Teki wrote:
> >> Allwinner SUN50I are now using DesignWare HDMI so enable
> >> them as default. This can build DRM_SUN8I_DW_HDMI as module
> >> since DRM in arm64 has module.
> >>
> >> Making this as defult to SUN8I, may cause an issue while
> >> loading since arm32 DRM built as static.
> >
> > Uh? Why? We should fix this instead of working around it.
> 
> I didn't dig further on this. Since ARM64 has is fine with it both
> (module and static) may be we can take this.

No, this build breakage needs to be (reported and) addressed first.

Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v4 1/4] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1017 bytes --]

On Tue, Sep 04, 2018 at 10:06:06PM +0530, Jagan Teki wrote:
> Allwinner SoC like SUN8I and SUN50I has DE2 CCU so enable them
> as default.
> 
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> Changes for v4, v3:
> - none
> Changes for v2:
> - Enable for MACH_SUN8I
> 
>  drivers/clk/sunxi-ng/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
> index 826674d090fd..e20182aa9748 100644
> --- a/drivers/clk/sunxi-ng/Kconfig
> +++ b/drivers/clk/sunxi-ng/Kconfig
> @@ -63,6 +63,8 @@ config SUN8I_V3S_CCU
>  
>  config SUN8I_DE2_CCU
>  	bool "Support for the Allwinner SoCs DE2 CCU"
> +	default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
> +	depends on DRM_SUN4I && (MACH_SUN8I || (ARM64 && ARCH_SUNXI))

I don't see why there's a dependency on the DRM driver. I'm pretty
sure this would even break simplefb.

Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v4 1/4] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I

[Jagan Teki]

On Wed, Sep 5, 2018 at 12:33 PM, Maxime Ripard
<maxime.ripard@bootlin.com> wrote:
> On Tue, Sep 04, 2018 at 10:06:06PM +0530, Jagan Teki wrote:
>> Allwinner SoC like SUN8I and SUN50I has DE2 CCU so enable them
>> as default.
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>> ---
>> Changes for v4, v3:
>> - none
>> Changes for v2:
>> - Enable for MACH_SUN8I
>>
>>  drivers/clk/sunxi-ng/Kconfig | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
>> index 826674d090fd..e20182aa9748 100644
>> --- a/drivers/clk/sunxi-ng/Kconfig
>> +++ b/drivers/clk/sunxi-ng/Kconfig
>> @@ -63,6 +63,8 @@ config SUN8I_V3S_CCU
>>
>>  config SUN8I_DE2_CCU
>>       bool "Support for the Allwinner SoCs DE2 CCU"
>> +     default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
>> +     depends on DRM_SUN4I && (MACH_SUN8I || (ARM64 && ARCH_SUNXI))
>
> I don't see why there's a dependency on the DRM driver. I'm pretty
> sure this would even break simplefb.

Ok, got it. I will drop the depends on just add default.

Re: [linux-sunxi] Re: [PATCH v4 1/4] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I

[Jernej Škrabec]

Dne sreda, 05. september 2018 ob 09:03:35 CEST je Maxime Ripard napisal(a):
> On Tue, Sep 04, 2018 at 10:06:06PM +0530, Jagan Teki wrote:
> > Allwinner SoC like SUN8I and SUN50I has DE2 CCU so enable them
> > as default.
> > 
> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > ---
> > Changes for v4, v3:
> > - none
> > Changes for v2:
> > - Enable for MACH_SUN8I
> > 
> >  drivers/clk/sunxi-ng/Kconfig | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
> > index 826674d090fd..e20182aa9748 100644
> > --- a/drivers/clk/sunxi-ng/Kconfig
> > +++ b/drivers/clk/sunxi-ng/Kconfig
> > @@ -63,6 +63,8 @@ config SUN8I_V3S_CCU
> > 
> >  config SUN8I_DE2_CCU
> >  
> >  	bool "Support for the Allwinner SoCs DE2 CCU"
> > 
> > +	default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
> > +	depends on DRM_SUN4I && (MACH_SUN8I || (ARM64 && ARCH_SUNXI))
> 
> I don't see why there's a dependency on the DRM driver. I'm pretty
> sure this would even break simplefb.

I think best approach would be that SUN8I_MIXER selects (or depends on?) this 
symbol, since it can't work if there is no DE2 CCU clock present.

Best regards,
Jernej

Re: [linux-sunxi] Re: [PATCH v4 1/4] clk: sunxi-ng: Enable DE2_CCU for SUN8I and SUN50I

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]

On Thu, Sep 06, 2018 at 07:10:06AM +0200, Jernej Škrabec wrote:
> Dne sreda, 05. september 2018 ob 09:03:35 CEST je Maxime Ripard napisal(a):
> > On Tue, Sep 04, 2018 at 10:06:06PM +0530, Jagan Teki wrote:
> > > Allwinner SoC like SUN8I and SUN50I has DE2 CCU so enable them
> > > as default.
> > > 
> > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> > > ---
> > > Changes for v4, v3:
> > > - none
> > > Changes for v2:
> > > - Enable for MACH_SUN8I
> > > 
> > >  drivers/clk/sunxi-ng/Kconfig | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
> > > index 826674d090fd..e20182aa9748 100644
> > > --- a/drivers/clk/sunxi-ng/Kconfig
> > > +++ b/drivers/clk/sunxi-ng/Kconfig
> > > @@ -63,6 +63,8 @@ config SUN8I_V3S_CCU
> > > 
> > >  config SUN8I_DE2_CCU
> > >  
> > >  	bool "Support for the Allwinner SoCs DE2 CCU"
> > > 
> > > +	default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
> > > +	depends on DRM_SUN4I && (MACH_SUN8I || (ARM64 && ARCH_SUNXI))
> > 
> > I don't see why there's a dependency on the DRM driver. I'm pretty
> > sure this would even break simplefb.
> 
> I think best approach would be that SUN8I_MIXER selects (or depends on?) this 
> symbol, since it can't work if there is no DE2 CCU clock present.

This is a runtime dependency, not a build time one. We're not doing it
for any other similar driver, so there's no reason to do it in this
particular case.

Maxime

-- 
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]