| Message ID | 20230929-sc7280-venus-pas-v1-2-9c6738cf157a@fairphone.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable venus on Fairphone 5 / non-ChromeOS sc7280 venus support | expand |
On 29/09/2023 09:38, Luca Weiss wrote: > If the video-firmware node is present, the venus driver assumes we're on > a non-TZ system. Move the video-firmware node to chrome-common.dtsi so > we can use venus on a TZ board. > > At the same time let's disable the venus node by default as is custom on > such nodes. > > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> > --- > arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 8 ++++++++ > arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 ++---- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi > index 5d462ae14ba1..cd491e46666d 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi > @@ -104,6 +104,14 @@ &scm { > dma-coherent; > }; > > +&venus { > + status = "okay"; > + > + video-firmware { > + iommus = <&apps_smmu 0x21a2 0x0>; > + }; > +}; > + > &watchdog { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi > index 66f1eb83cca7..fa53f54d4675 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi > @@ -3740,6 +3740,8 @@ venus: video-codec@aa00000 { > <&apps_smmu 0x2184 0x20>; > memory-region = <&video_mem>; > > + status = "disabled"; > + > video-decoder { > compatible = "venus-decoder"; > }; > @@ -3748,10 +3750,6 @@ video-encoder { > compatible = "venus-encoder"; > }; > > - video-firmware { > - iommus = <&apps_smmu 0x21a2 0x0>; > - }; > - > venus_opp_table: opp-table { > compatible = "operating-points-v2"; > > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
On 29.09.2023 10:38, Luca Weiss wrote: > If the video-firmware node is present, the venus driver assumes we're on > a non-TZ system. On a system that doesn't use TZ for kickstarting Venus Chrome devices have something running in EL3, so TZ is present, just not the standard qcom one that we've grown to.. love.. Move the video-firmware node to chrome-common.dtsi so > we can use venus on a TZ board. On non-Chrome boards > At the same time let's disable the venus node by default as is custom on > such nodes. I think that's not what you tried to say The contents look good! Konrad
diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi index 5d462ae14ba1..cd491e46666d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi @@ -104,6 +104,14 @@ &scm { dma-coherent; }; +&venus { + status = "okay"; + + video-firmware { + iommus = <&apps_smmu 0x21a2 0x0>; + }; +}; + &watchdog { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 66f1eb83cca7..fa53f54d4675 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3740,6 +3740,8 @@ venus: video-codec@aa00000 { <&apps_smmu 0x2184 0x20>; memory-region = <&video_mem>; + status = "disabled"; + video-decoder { compatible = "venus-decoder"; }; @@ -3748,10 +3750,6 @@ video-encoder { compatible = "venus-encoder"; }; - video-firmware { - iommus = <&apps_smmu 0x21a2 0x0>; - }; - venus_opp_table: opp-table { compatible = "operating-points-v2";
If the video-firmware node is present, the venus driver assumes we're on a non-TZ system. Move the video-firmware node to chrome-common.dtsi so we can use venus on a TZ board. At the same time let's disable the venus node by default as is custom on such nodes. Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 8 ++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-)