2018-12-20 09:18:18

by Malathi Gottam

Subject: [PATCH v3] arm64: dts: sdm845: add video nodes

This adds video nodes to sdm845 based on the examples
in the bindings.

Signed-off-by: Malathi Gottam <[email protected]>
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index b72bdb0..ccd2b10 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -87,6 +87,11 @@
reg = <0 0x86200000 0 0x2d00000>;
no-map;
};
+
+ venus_region: memory@95800000 {
+ reg = <0x0 0x95800000 0x0 0x500000>;
+ no-map;
+ };
};

cpus {
@@ -1403,5 +1408,35 @@
status = "disabled";
};
};
+
+ video-codec@aa00000 {
+ compatible = "qcom,sdm845-venus";
+ reg = <0x0aa00000 0xff000>;
+ interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+ power-domains = <&videocc VENUS_GDSC>;
+ clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+ <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+ <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
+ clock-names = "core", "iface", "bus";
+ iommus = <&apps_smmu 0x10a0 0x8>,
+ <&apps_smmu 0x10b0 0x0>;
+ memory-region = <&venus_region>;
+
+ video-core0 {
+ compatible = "venus-decoder";
+ clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+ <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+ clock-names = "core", "bus";
+ power-domains = <&videocc VCODEC0_GDSC>;
+ };
+
+ video-core1 {
+ compatible = "venus-encoder";
+ clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
+ <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
+ clock-names = "core", "bus";
+ power-domains = <&videocc VCODEC1_GDSC>;
+ };
+ };
};
};
--
1.9.1

2019-01-17 12:07:23

by Stanimir Varbanov

Subject: Re: [PATCH v3] arm64: dts: sdm845: add video nodes

Hi Malathi,

On 12/20/18 9:47 AM, Malathi Gottam wrote:
> This adds video nodes to sdm845 based on the examples
> in the bindings.
>
> Signed-off-by: Malathi Gottam <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
> 1 file changed, 35 insertions(+)

Looks good to me:

Reviewed-by: Stanimir Varbanov <[email protected]>

>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index b72bdb0..ccd2b10 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -87,6 +87,11 @@
> reg = <0 0x86200000 0 0x2d00000>;
> no-map;
> };
> +
> + venus_region: memory@95800000 {
> + reg = <0x0 0x95800000 0x0 0x500000>;
> + no-map;
> + };
> };
>
> cpus {
> @@ -1403,5 +1408,35 @@
> status = "disabled";
> };
> };
> +
> + video-codec@aa00000 {
> + compatible = "qcom,sdm845-venus";
> + reg = <0x0aa00000 0xff000>;
> + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
> + power-domains = <&videocc VENUS_GDSC>;
> + clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
> + <&videocc VIDEO_CC_VENUS_AHB_CLK>,
> + <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
> + clock-names = "core", "iface", "bus";
> + iommus = <&apps_smmu 0x10a0 0x8>,
> + <&apps_smmu 0x10b0 0x0>;
> + memory-region = <&venus_region>;
> +
> + video-core0 {
> + compatible = "venus-decoder";
> + clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
> + <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
> + clock-names = "core", "bus";
> + power-domains = <&videocc VCODEC0_GDSC>;
> + };
> +
> + video-core1 {
> + compatible = "venus-encoder";
> + clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
> + <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
> + clock-names = "core", "bus";
> + power-domains = <&videocc VCODEC1_GDSC>;
> + };
> + };
> };
> };
>

--
regards,
Stan

2019-01-25 07:56:47

by Malathi Gottam

Subject: Re: [PATCH v3] arm64: dts: sdm845: add video nodes

On 2019-01-25 13:16, Alexandre Courbot wrote:
> On Thu, Jan 17, 2019 at 8:58 PM Stanimir Varbanov
> <[email protected]> wrote:
>>
>> Hi Malathi,
>>
>> On 12/20/18 9:47 AM, Malathi Gottam wrote:
>> > This adds video nodes to sdm845 based on the examples
>> > in the bindings.
>> >
>> > Signed-off-by: Malathi Gottam <[email protected]>
>> > ---
>> > arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
>> > 1 file changed, 35 insertions(+)
>>
>> Looks good to me:
>>
>> Reviewed-by: Stanimir Varbanov <[email protected]>
>>
>> >
>> > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
>> > index b72bdb0..ccd2b10 100644
>> > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
>> > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
>> > @@ -87,6 +87,11 @@
>> > reg = <0 0x86200000 0 0x2d00000>;
>> > no-map;
>> > };
>> > +
>> > + venus_region: memory@95800000 {
>> > + reg = <0x0 0x95800000 0x0 0x500000>;
>> > + no-map;
>> > + };
>> > };
>> >
>> > cpus {
>> > @@ -1403,5 +1408,35 @@
>> > status = "disabled";
>> > };
>> > };
>> > +
>> > + video-codec@aa00000 {
>> > + compatible = "qcom,sdm845-venus";
>> > + reg = <0x0aa00000 0xff000>;
>> > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
>> > + power-domains = <&videocc VENUS_GDSC>;
>> > + clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
>> > + <&videocc VIDEO_CC_VENUS_AHB_CLK>,
>> > + <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
>> > + clock-names = "core", "iface", "bus";
>> > + iommus = <&apps_smmu 0x10a0 0x8>,
>> > + <&apps_smmu 0x10b0 0x0>;
>> > + memory-region = <&venus_region>;
>> > +
>> > + video-core0 {
>> > + compatible = "venus-decoder";
>> > + clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
>> > + <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
>> > + clock-names = "core", "bus";
>> > + power-domains = <&videocc VCODEC0_GDSC>;
>> > + };
>> > +
>> > + video-core1 {
>> > + compatible = "venus-encoder";
>> > + clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
>> > + <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
>> > + clock-names = "core", "bus";
>> > + power-domains = <&videocc VCODEC1_GDSC>;
>> > + };
>> > + };
>
> This patch lacks the video-firmware node, it should at the very least
> be added before this gets merged.

Yes Alex, I missed adding video-firmware node. Thanks for noticing.
Will add it and post new version.

Thanks,
Malathi.

2019-01-25 08:07:19

by Alexandre Courbot

Subject: Re: [PATCH v3] arm64: dts: sdm845: add video nodes

On Thu, Jan 17, 2019 at 8:58 PM Stanimir Varbanov
<[email protected]> wrote:
>
> Hi Malathi,
>
> On 12/20/18 9:47 AM, Malathi Gottam wrote:
> > This adds video nodes to sdm845 based on the examples
> > in the bindings.
> >
> > Signed-off-by: Malathi Gottam <[email protected]>
> > ---
> > arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
> > 1 file changed, 35 insertions(+)
>
> Looks good to me:
>
> Reviewed-by: Stanimir Varbanov <[email protected]>
>
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > index b72bdb0..ccd2b10 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > @@ -87,6 +87,11 @@
> > reg = <0 0x86200000 0 0x2d00000>;
> > no-map;
> > };
> > +
> > + venus_region: memory@95800000 {
> > + reg = <0x0 0x95800000 0x0 0x500000>;
> > + no-map;
> > + };
> > };
> >
> > cpus {
> > @@ -1403,5 +1408,35 @@
> > status = "disabled";
> > };
> > };
> > +
> > + video-codec@aa00000 {
> > + compatible = "qcom,sdm845-venus";
> > + reg = <0x0aa00000 0xff000>;
> > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
> > + power-domains = <&videocc VENUS_GDSC>;
> > + clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
> > + <&videocc VIDEO_CC_VENUS_AHB_CLK>,
> > + <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
> > + clock-names = "core", "iface", "bus";
> > + iommus = <&apps_smmu 0x10a0 0x8>,
> > + <&apps_smmu 0x10b0 0x0>;
> > + memory-region = <&venus_region>;
> > +
> > + video-core0 {
> > + compatible = "venus-decoder";
> > + clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
> > + <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
> > + clock-names = "core", "bus";
> > + power-domains = <&videocc VCODEC0_GDSC>;
> > + };
> > +
> > + video-core1 {
> > + compatible = "venus-encoder";
> > + clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
> > + <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
> > + clock-names = "core", "bus";
> > + power-domains = <&videocc VCODEC1_GDSC>;
> > + };
> > + };

This patch lacks the video-firmware node, it should at the very least
be added before this gets merged.

2019-01-25 08:33:12

by Stanimir Varbanov

Subject: Re: [PATCH v3] arm64: dts: sdm845: add video nodes

Hi Alex,

On 1/25/19 9:46 AM, Alexandre Courbot wrote:
> On Thu, Jan 17, 2019 at 8:58 PM Stanimir Varbanov
> <[email protected]> wrote:
>>
>> Hi Malathi,
>>
>> On 12/20/18 9:47 AM, Malathi Gottam wrote:
>>> This adds video nodes to sdm845 based on the examples
>>> in the bindings.
>>>
>>> Signed-off-by: Malathi Gottam <[email protected]>
>>> ---
>>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
>>> 1 file changed, 35 insertions(+)
>>
>> Looks good to me:
>>
>> Reviewed-by: Stanimir Varbanov <[email protected]>
>>
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
>>> index b72bdb0..ccd2b10 100644
>>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
>>> @@ -87,6 +87,11 @@
>>> reg = <0 0x86200000 0 0x2d00000>;
>>> no-map;
>>> };
>>> +
>>> + venus_region: memory@95800000 {
>>> + reg = <0x0 0x95800000 0x0 0x500000>;
>>> + no-map;
>>> + };
>>> };
>>>
>>> cpus {
>>> @@ -1403,5 +1408,35 @@
>>> status = "disabled";
>>> };
>>> };
>>> +
>>> + video-codec@aa00000 {
>>> + compatible = "qcom,sdm845-venus";
>>> + reg = <0x0aa00000 0xff000>;
>>> + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
>>> + power-domains = <&videocc VENUS_GDSC>;
>>> + clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
>>> + <&videocc VIDEO_CC_VENUS_AHB_CLK>,
>>> + <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
>>> + clock-names = "core", "iface", "bus";
>>> + iommus = <&apps_smmu 0x10a0 0x8>,
>>> + <&apps_smmu 0x10b0 0x0>;
>>> + memory-region = <&venus_region>;
>>> +
>>> + video-core0 {
>>> + compatible = "venus-decoder";
>>> + clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
>>> + <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
>>> + clock-names = "core", "bus";
>>> + power-domains = <&videocc VCODEC0_GDSC>;
>>> + };
>>> +
>>> + video-core1 {
>>> + compatible = "venus-encoder";
>>> + clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
>>> + <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
>>> + clock-names = "core", "bus";
>>> + power-domains = <&videocc VCODEC1_GDSC>;
>>> + };
>>> + };
>
> This patch lacks the video-firmware node, it should at the very least
> be added before this gets merged.

The firmware node should be added in board dts file, the for example
sdm845-mtp will not populate firmware node because it uses TZ for
firmware loading.


--
regards,
Stan

2019-01-25 10:33:04

by Alexandre Courbot

Subject: Re: [PATCH v3] arm64: dts: sdm845: add video nodes

On Fri, Jan 25, 2019 at 5:32 PM Stanimir Varbanov
<[email protected]> wrote:
>
> Hi Alex,
>
> On 1/25/19 9:46 AM, Alexandre Courbot wrote:
> > On Thu, Jan 17, 2019 at 8:58 PM Stanimir Varbanov
> > <[email protected]> wrote:
> >>
> >> Hi Malathi,
> >>
> >> On 12/20/18 9:47 AM, Malathi Gottam wrote:
> >>> This adds video nodes to sdm845 based on the examples
> >>> in the bindings.
> >>>
> >>> Signed-off-by: Malathi Gottam <[email protected]>
> >>> ---
> >>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 35 +++++++++++++++++++++++++++++++++++
> >>> 1 file changed, 35 insertions(+)
> >>
> >> Looks good to me:
> >>
> >> Reviewed-by: Stanimir Varbanov <[email protected]>
> >>
> >>>
> >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> >>> index b72bdb0..ccd2b10 100644
> >>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> >>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> >>> @@ -87,6 +87,11 @@
> >>> reg = <0 0x86200000 0 0x2d00000>;
> >>> no-map;
> >>> };
> >>> +
> >>> + venus_region: memory@95800000 {
> >>> + reg = <0x0 0x95800000 0x0 0x500000>;
> >>> + no-map;
> >>> + };
> >>> };
> >>>
> >>> cpus {
> >>> @@ -1403,5 +1408,35 @@
> >>> status = "disabled";
> >>> };
> >>> };
> >>> +
> >>> + video-codec@aa00000 {
> >>> + compatible = "qcom,sdm845-venus";
> >>> + reg = <0x0aa00000 0xff000>;
> >>> + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
> >>> + power-domains = <&videocc VENUS_GDSC>;
> >>> + clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
> >>> + <&videocc VIDEO_CC_VENUS_AHB_CLK>,
> >>> + <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>;
> >>> + clock-names = "core", "iface", "bus";
> >>> + iommus = <&apps_smmu 0x10a0 0x8>,
> >>> + <&apps_smmu 0x10b0 0x0>;
> >>> + memory-region = <&venus_region>;
> >>> +
> >>> + video-core0 {
> >>> + compatible = "venus-decoder";
> >>> + clocks = <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
> >>> + <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
> >>> + clock-names = "core", "bus";
> >>> + power-domains = <&videocc VCODEC0_GDSC>;
> >>> + };
> >>> +
> >>> + video-core1 {
> >>> + compatible = "venus-encoder";
> >>> + clocks = <&videocc VIDEO_CC_VCODEC1_CORE_CLK>,
> >>> + <&videocc VIDEO_CC_VCODEC1_AXI_CLK>;
> >>> + clock-names = "core", "bus";
> >>> + power-domains = <&videocc VCODEC1_GDSC>;
> >>> + };
> >>> + };
> >
> > This patch lacks the video-firmware node, it should at the very least
> > be added before this gets merged.
>
> The firmware node should be added in board dts file, the for example
> sdm845-mtp will not populate firmware node because it uses TZ for
> firmware loading.

Ah, that's a good point. In that case the previous patch was alright,
sorry Malathi!