Hello,
Changes since v3:
- addressed DT and DT schema review comments.
- renamed DT schema file.
v3 can be found at [1].
These changes depend on patch series [2] - [6].
Thanks,
Dikshita
[1] https://lkml.org/lkml/2020/1/2/267
[2] https://patchwork.kernel.org/project/linux-media/list/?series=219021
[3] https://patchwork.kernel.org/project/linux-media/list/?series=214797
[4] https://lkml.org/lkml/2019/12/27/73
[5] https://lore.kernel.org/patchwork/project/lkml/list/?series=418681
[6] https://lore.kernel.org/patchwork/project/lkml/list/?series=424054
Dikshita Agarwal (4):
arm64: dts: sc7180: Add Venus video codec DT node
dt-bindings: media: venus: Add sc7180 DT schema
venus: core: add sc7180 DT compatible and resource struct
arm64: dts: sc7180: Add Venus firmware subnode
.../bindings/media/qcom,sc7180-venus.yaml | 144 +++++++++++++++++++++
arch/arm64/boot/dts/qcom/sc7180-idp.dts | 6 +
arch/arm64/boot/dts/qcom/sc7180.dtsi | 36 ++++++
drivers/media/platform/qcom/venus/core.c | 45 +++++++
4 files changed, 231 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml
--
1.9.1
This adds Venus video codec DT node for sc7180.
Signed-off-by: Dikshita Agarwal <[email protected]>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 3676bfd..6ecacca 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -10,6 +10,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/phy/phy-qcom-qusb2.h>
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
+#include <dt-bindings/clock/qcom,videocc-sc7180.h>
/ {
interrupt-parent = <&intc>;
@@ -66,6 +67,11 @@
compatible = "qcom,cmd-db";
no-map;
};
+
+ venus_mem: memory@8f600000 {
+ reg = <0 0x8f600000 0 0x500000>;
+ no-map;
+ };
};
cpus {
@@ -1043,6 +1049,36 @@
};
};
+ venus: video-codec@aa00000 {
+ compatible = "qcom,sc7180-venus";
+ reg = <0 0x0aa00000 0 0xff000>;
+ interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+ power-domains = <&videocc VENUS_GDSC>,
+ <&videocc VCODEC0_GDSC>;
+ power-domain-names = "venus", "vcodec0";
+ clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
+ <&videocc VIDEO_CC_VENUS_AHB_CLK>,
+ <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
+ <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
+ <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
+ clock-names = "core", "iface", "bus",
+ "vcodec0_core", "vcodec0_bus";
+ iommus = <&apps_smmu 0x0c00 0x60>;
+ memory-region = <&venus_mem>;
+
+ interconnects = <&mmss_noc MASTER_VIDEO_P0 &mc_virt SLAVE_EBI1>,
+ <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_VENUS_CFG>;
+ interconnect-names = "video-mem", "cpu-cfg";
+
+ video-decoder {
+ compatible = "venus-decoder";
+ };
+
+ video-encoder {
+ compatible = "venus-encoder";
+ };
+ };
+
pdc: interrupt-controller@b220000 {
compatible = "qcom,sc7180-pdc", "qcom,pdc";
reg = <0 0x0b220000 0 0x30000>;
--
1.9.1
Hi,
On 1/14/20 2:53 PM, Dikshita Agarwal wrote:
> This adds Venus video codec DT node for sc7180.
>
> Signed-off-by: Dikshita Agarwal <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
Reviewed-by: Stanimir Varbanov <[email protected]>
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 3676bfd..6ecacca 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -10,6 +10,7 @@
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/phy/phy-qcom-qusb2.h>
> #include <dt-bindings/soc/qcom,rpmh-rsc.h>
> +#include <dt-bindings/clock/qcom,videocc-sc7180.h>
>
> / {
> interrupt-parent = <&intc>;
> @@ -66,6 +67,11 @@
> compatible = "qcom,cmd-db";
> no-map;
> };
> +
> + venus_mem: memory@8f600000 {
> + reg = <0 0x8f600000 0 0x500000>;
> + no-map;
> + };
> };
>
> cpus {
> @@ -1043,6 +1049,36 @@
> };
> };
>
> + venus: video-codec@aa00000 {
> + compatible = "qcom,sc7180-venus";
> + reg = <0 0x0aa00000 0 0xff000>;
> + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
> + power-domains = <&videocc VENUS_GDSC>,
> + <&videocc VCODEC0_GDSC>;
> + power-domain-names = "venus", "vcodec0";
> + clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>,
> + <&videocc VIDEO_CC_VENUS_AHB_CLK>,
> + <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
> + <&videocc VIDEO_CC_VCODEC0_CORE_CLK>,
> + <&videocc VIDEO_CC_VCODEC0_AXI_CLK>;
> + clock-names = "core", "iface", "bus",
> + "vcodec0_core", "vcodec0_bus";
> + iommus = <&apps_smmu 0x0c00 0x60>;
> + memory-region = <&venus_mem>;
> +
> + interconnects = <&mmss_noc MASTER_VIDEO_P0 &mc_virt SLAVE_EBI1>,
> + <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_VENUS_CFG>;
> + interconnect-names = "video-mem", "cpu-cfg";
> +
> + video-decoder {
> + compatible = "venus-decoder";
> + };
> +
> + video-encoder {
> + compatible = "venus-encoder";
> + };
> + };
> +
> pdc: interrupt-controller@b220000 {
> compatible = "qcom,sc7180-pdc", "qcom,pdc";
> reg = <0 0x0b220000 0 0x30000>;
>
--
regards,
Stan
On Tue 14 Jan 04:53 PST 2020, Dikshita Agarwal wrote:
> Hello,
>
> Changes since v3:
>
> - addressed DT and DT schema review comments.
>
> - renamed DT schema file.
>
> v3 can be found at [1].
> These changes depend on patch series [2] - [6].
>
> Thanks,
> Dikshita
>
Picked up the dts patches for 5.7, with Stan's acks
Regards,
Bjorn
> [1] https://lkml.org/lkml/2020/1/2/267
> [2] https://patchwork.kernel.org/project/linux-media/list/?series=219021
> [3] https://patchwork.kernel.org/project/linux-media/list/?series=214797
> [4] https://lkml.org/lkml/2019/12/27/73
> [5] https://lore.kernel.org/patchwork/project/lkml/list/?series=418681
> [6] https://lore.kernel.org/patchwork/project/lkml/list/?series=424054
>
> Dikshita Agarwal (4):
> arm64: dts: sc7180: Add Venus video codec DT node
> dt-bindings: media: venus: Add sc7180 DT schema
> venus: core: add sc7180 DT compatible and resource struct
> arm64: dts: sc7180: Add Venus firmware subnode
>
> .../bindings/media/qcom,sc7180-venus.yaml | 144 +++++++++++++++++++++
> arch/arm64/boot/dts/qcom/sc7180-idp.dts | 6 +
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 36 ++++++
> drivers/media/platform/qcom/venus/core.c | 45 +++++++
> 4 files changed, 231 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml
>
> --
> 1.9.1
>
Hi Bjorn,
On Mon, Feb 03, 2020 at 10:02:40AM -0800, Bjorn Andersson wrote:
> On Tue 14 Jan 04:53 PST 2020, Dikshita Agarwal wrote:
>
> > Hello,
> >
> > Changes since v3:
> >
> > - addressed DT and DT schema review comments.
> >
> > - renamed DT schema file.
> >
> > v3 can be found at [1].
> > These changes depend on patch series [2] - [6].
> >
> > Thanks,
> > Dikshita
> >
>
> Picked up the dts patches for 5.7, with Stan's acks
I can't seem to find the patches in the QCOM repo, neither in
'arm64-for-5.7' nor 'for-next'. Am I looking at the wrong place or
maybe you forget to push these?
Thanks
Matthias
On Thu 13 Feb 10:53 PST 2020, Matthias Kaehlcke wrote:
> Hi Bjorn,
>
> On Mon, Feb 03, 2020 at 10:02:40AM -0800, Bjorn Andersson wrote:
> > On Tue 14 Jan 04:53 PST 2020, Dikshita Agarwal wrote:
> >
> > > Hello,
> > >
> > > Changes since v3:
> > >
> > > - addressed DT and DT schema review comments.
> > >
> > > - renamed DT schema file.
> > >
> > > v3 can be found at [1].
> > > These changes depend on patch series [2] - [6].
> > >
> > > Thanks,
> > > Dikshita
> > >
> >
> > Picked up the dts patches for 5.7, with Stan's acks
>
> I can't seem to find the patches in the QCOM repo, neither in
> 'arm64-for-5.7' nor 'for-next'. Am I looking at the wrong place or
> maybe you forget to push these?
>
Thanks for the question Matthias, I was looking for this email as I
rebased onto v5.6-rc1 earlier this week, but got distracted.
I pulled them in, but in the rebase I realized that we don't have the
interconnects in place, so in it's current form these patches doesn't
compile.
Seems we're waiting for rather trivial respin of
https://lore.kernel.org/linux-arm-msm/[email protected]/
to get this settled.
Regards,
Bjorn
On Thu, Feb 13, 2020 at 11:26:27AM -0800, Bjorn Andersson wrote:
> On Thu 13 Feb 10:53 PST 2020, Matthias Kaehlcke wrote:
>
> > Hi Bjorn,
> >
> > On Mon, Feb 03, 2020 at 10:02:40AM -0800, Bjorn Andersson wrote:
> > > On Tue 14 Jan 04:53 PST 2020, Dikshita Agarwal wrote:
> > >
> > > > Hello,
> > > >
> > > > Changes since v3:
> > > >
> > > > - addressed DT and DT schema review comments.
> > > >
> > > > - renamed DT schema file.
> > > >
> > > > v3 can be found at [1].
> > > > These changes depend on patch series [2] - [6].
> > > >
> > > > Thanks,
> > > > Dikshita
> > > >
> > >
> > > Picked up the dts patches for 5.7, with Stan's acks
> >
> > I can't seem to find the patches in the QCOM repo, neither in
> > 'arm64-for-5.7' nor 'for-next'. Am I looking at the wrong place or
> > maybe you forget to push these?
> >
>
> Thanks for the question Matthias, I was looking for this email as I
> rebased onto v5.6-rc1 earlier this week, but got distracted.
>
> I pulled them in, but in the rebase I realized that we don't have the
> interconnects in place, so in it's current form these patches doesn't
> compile.
Now that you say it, I also stumbled across this at some point ...
> Seems we're waiting for rather trivial respin of
> https://lore.kernel.org/linux-arm-msm/[email protected]/
> to get this settled.
Thanks for the clarification!
On Thu, Feb 13, 2020 at 11:26:27AM -0800, Bjorn Andersson wrote:
> On Thu 13 Feb 10:53 PST 2020, Matthias Kaehlcke wrote:
>
> > Hi Bjorn,
> >
> > On Mon, Feb 03, 2020 at 10:02:40AM -0800, Bjorn Andersson wrote:
> > > On Tue 14 Jan 04:53 PST 2020, Dikshita Agarwal wrote:
> > >
> > > > Hello,
> > > >
> > > > Changes since v3:
> > > >
> > > > - addressed DT and DT schema review comments.
> > > >
> > > > - renamed DT schema file.
> > > >
> > > > v3 can be found at [1].
> > > > These changes depend on patch series [2] - [6].
> > > >
> > > > Thanks,
> > > > Dikshita
> > > >
> > >
> > > Picked up the dts patches for 5.7, with Stan's acks
> >
> > I can't seem to find the patches in the QCOM repo, neither in
> > 'arm64-for-5.7' nor 'for-next'. Am I looking at the wrong place or
> > maybe you forget to push these?
> >
>
> Thanks for the question Matthias, I was looking for this email as I
> rebased onto v5.6-rc1 earlier this week, but got distracted.
>
> I pulled them in, but in the rebase I realized that we don't have the
> interconnects in place, so in it's current form these patches doesn't
> compile.
>
> Seems we're waiting for rather trivial respin of
> https://lore.kernel.org/linux-arm-msm/[email protected]/
> to get this settled.
Hm, there has been no response to the comments in more than a month, also
the series depends on another ('Split SDM845 interconnect nodes and
consolidate RPMh support' https://patchwork.kernel.org/project/linux-arm-msm/list/?series=238831),
even though that isn't mentioned anywhere.
IIUC the interconnect configuration isn't strictly required to get the
video codec to work. I wonder if it would make sense to respin this
series to remove the interconnect properties. They could be added in a
separate patch after the ICC support has landed.
Dikshita/Bjorn, what do you think?
On Thu 13 Feb 11:57 PST 2020, Matthias Kaehlcke wrote:
> On Thu, Feb 13, 2020 at 11:26:27AM -0800, Bjorn Andersson wrote:
> > On Thu 13 Feb 10:53 PST 2020, Matthias Kaehlcke wrote:
> >
> > > Hi Bjorn,
> > >
> > > On Mon, Feb 03, 2020 at 10:02:40AM -0800, Bjorn Andersson wrote:
> > > > On Tue 14 Jan 04:53 PST 2020, Dikshita Agarwal wrote:
> > > >
> > > > > Hello,
> > > > >
> > > > > Changes since v3:
> > > > >
> > > > > - addressed DT and DT schema review comments.
> > > > >
> > > > > - renamed DT schema file.
> > > > >
> > > > > v3 can be found at [1].
> > > > > These changes depend on patch series [2] - [6].
> > > > >
> > > > > Thanks,
> > > > > Dikshita
> > > > >
> > > >
> > > > Picked up the dts patches for 5.7, with Stan's acks
> > >
> > > I can't seem to find the patches in the QCOM repo, neither in
> > > 'arm64-for-5.7' nor 'for-next'. Am I looking at the wrong place or
> > > maybe you forget to push these?
> > >
> >
> > Thanks for the question Matthias, I was looking for this email as I
> > rebased onto v5.6-rc1 earlier this week, but got distracted.
> >
> > I pulled them in, but in the rebase I realized that we don't have the
> > interconnects in place, so in it's current form these patches doesn't
> > compile.
> >
> > Seems we're waiting for rather trivial respin of
> > https://lore.kernel.org/linux-arm-msm/[email protected]/
> > to get this settled.
>
> Hm, there has been no response to the comments in more than a month, also
> the series depends on another ('Split SDM845 interconnect nodes and
> consolidate RPMh support' https://patchwork.kernel.org/project/linux-arm-msm/list/?series=238831),
> even though that isn't mentioned anywhere.
>
Sibi is revisiting David's 845 series, so my expectation is that it will
land in this cycle.
> IIUC the interconnect configuration isn't strictly required to get the
> video codec to work. I wonder if it would make sense to respin this
> series to remove the interconnect properties. They could be added in a
> separate patch after the ICC support has landed.
>
> Dikshita/Bjorn, what do you think?
That sounds likely. Dikshita, can you confirm that we can just omit the
interconnect lines from the patch and I'll just apply the patches again
without these (and you can follow up with adding interconnects later).
Regards,
Bjorn