mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 02:32:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: qcom: sc7280: Move video-firmware to chrome-common

Browse Source 
If the video-firmware node is present, the venus driver assumes we're on
a system that doesn't use TZ for starting venus, like on ChromeOS
devices.

Move the video-firmware node to chrome-common.dtsi so we can use venus
on a non-ChromeOS devices. We also need to move the secure SID 0x2184
for iommu since (on some boards) we cannot touch that.

At the same time also disable the venus node by default in the dtsi,
like it's done on other SoCs.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Link: https://lore.kernel.org/r/20231201-sc7280-venus-pas-v3-2-bc132dc5fc30@fairphone.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Luca Weiss
2023-12-01 10:33:19 +01:00
committed by Bjorn Andersson
parent e81e86765f
commit 82066cdb17
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
View File

@@ -119,6 +119,17 @@ &scm {
dma-coherent;
};
&venus {
iommus = <&apps_smmu 0x2180 0x20>,
<&apps_smmu 0x2184 0x20>;
status = "okay";
video-firmware {
iommus = <&apps_smmu 0x21a2 0x0>;
};
};
&watchdog {
status = "okay";
};

9
arch/arm64/boot/dts/qcom/sc7280.dtsi
View File

@@ -4099,10 +4099,11 @@ venus: video-codec@aa00000 {
<&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>;
interconnect-names = "cpu-cfg", "video-mem";
iommus = <&apps_smmu 0x2180 0x20>,
<&apps_smmu 0x2184 0x20>;
iommus = <&apps_smmu 0x2180 0x20>;
memory-region = <&video_mem>;
status = "disabled";
video-decoder {
compatible = "venus-decoder";
};
@@ -4111,10 +4112,6 @@ video-encoder {
compatible = "venus-encoder";
};
video-firmware {
iommus = <&apps_smmu 0x21a2 0x0>;
};
venus_opp_table: opp-table {
compatible = "operating-points-v2";