Skip to content

avd support #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sofus13 wants to merge 10 commits into
base: asahi-wip
Choose a base branch
from
+4,186 −3
Open

avd support #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
53f8e5a
arm64: dts: apple: t8103: add avd nodes
sofus13 Jul 7, 2026
0769faf
arm64: dts: apple: t600x: add avd nodes
sofus13 Jun 19, 2026
dcafd08
arm64: dts: apple: t8112: add avd nodes
sofus13 Jun 30, 2026
ca5a405
arm64: dts: apple: t602x: add avd nodes
sofus13 Jun 30, 2026
150ec8e
arm64: dts: apple: t8122: add avd nodes
sofus13 Jun 19, 2026
911accb
arm64: dts: apple: t6030: add avd nodes
sofus13 Jun 26, 2026
4916522
arm64: dts: apple: t6031: add avd nodes
sofus13 Jun 26, 2026
6266cd8
iommu: apple-dart: Reset hardware when setting up translations
sofus13 Jun 30, 2026
b8defc5
media: apple: add avd driver
sofus13 Jun 30, 2026
852f1ec
media: apple: avd: support vp9
sofus13 Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion arch/arm64/boot/dts/apple/t600x-die0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
label = "pmp-avd-sys";
#power-domain-cells = <0>;
power-domains = <&ps_avd_sys>;
status = "disabled";
};

pmp_report_msr0: report@12 {
Expand Down
28 changes: 28 additions & 0 deletions arch/arm64/boot/dts/apple/t600x-dieX.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,34 @@
#performance-domain-cells = <0>;
};

DIE_NODE(avd): avd@286000000 {
compatible = "apple,t6000-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 1011 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 1012 IRQ_TYPE_LEVEL_HIGH>;
#ifdef APPLE_USE_PMP
power-domains = <&DIE_NODE(pmp_report_avd_sys)>;
#else
power-domains = <&DIE_NODE(ps_avd_sys)>;
#endif
resets = <&DIE_NODE(ps_avd_sys)>;
reg = <0x2 0x87080000 0x0 0x10000>,
<0x2 0x87090000 0x0 0x10000>,
<0x2 0x870a0000 0x0 0x4000>,
<0x2 0x87100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&DIE_NODE(avd_dart) 0>;
};

DIE_NODE(avd_dart): iommu@287010000 {
compatible = "apple,t8110-dart";
reg = <0x2 0x87010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 1018 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&DIE_NODE(ps_avd_sys)>;
};

DIE_NODE(dispext0_dart): iommu@289304000 {
compatible = "apple,t6000-dart";
reg = <0x2 0x89304000 0x0 0x4000>;
Expand Down
1 change: 0 additions & 1 deletion arch/arm64/boot/dts/apple/t602x-die0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
label = "pmp-avd-sys";
#power-domain-cells = <0>;
power-domains = <&ps_avd_sys>;
status = "disabled";
};

pmp_report_msr0: report@12 {
Expand Down
28 changes: 28 additions & 0 deletions arch/arm64/boot/dts/apple/t602x-dieX.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,34 @@
#performance-domain-cells = <0>;
};

DIE_NODE(avd): avd@286000000 {
compatible = "apple,t6020-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 1088 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 1089 IRQ_TYPE_LEVEL_HIGH>;
#ifdef APPLE_USE_PMP
power-domains = <&DIE_NODE(pmp_report_avd_sys)>;
#else
power-domains = <&DIE_NODE(ps_avd_sys)>;
#endif
resets = <&DIE_NODE(ps_avd_sys)>;
reg = <0x2 0x87080000 0x0 0x10000>,
<0x2 0x87090000 0x0 0x10000>,
<0x2 0x870a0000 0x0 0x4000>,
<0x2 0x87100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&DIE_NODE(avd_dart) 0>;
};

DIE_NODE(avd_dart): iommu@287010000 {
compatible = "apple,t6020-dart", "apple,t8110-dart";
reg = <0x2 0x87010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 1095 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&DIE_NODE(ps_avd_sys)>;
};

DIE_NODE(dispext0_dart): iommu@289304000 {
compatible = "apple,t6020-dart", "apple,t8110-dart";
reg = <0x2 0x89304000 0x0 0x4000>;
Expand Down
24 changes: 24 additions & 0 deletions arch/arm64/boot/dts/apple/t6030.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,30 @@
status = "disabled";
};

avd: avd@30a000000 {
compatible = "apple,t6030-avd", "apple,t8122-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 788 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 789 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
resets = <&ps_avd_sys>;
reg = <0x3 0x0b080000 0x0 0x12000>,
<0x3 0x0b092000 0x0 0x12000>,
<0x3 0x0b0a4000 0x0 0x4000>,
<0x3 0x0b100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&avd_dart 0>;
};

avd_dart: iommu@30b010000 {
compatible = "apple,t6030-dart", "apple,t8110-dart";
reg = <0x3 0x0b010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 795 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
};

pinctrl_ap: pinctrl@347100000 {
compatible = "apple,t6030-pinctrl", "apple,t8103-pinctrl";
reg = <0x3 0x47100000 0x0 0x4000>;
Expand Down
24 changes: 24 additions & 0 deletions arch/arm64/boot/dts/apple/t6031-dieX.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,30 @@
<AIC_IRQ DIE_NO 601 IRQ_TYPE_LEVEL_HIGH>;
};

DIE_NODE(avd): avd@2cc000000 {
compatible = "apple,t6031-avd", "apple,t8122-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 1185 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ DIE_NO 1186 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&DIE_NODE(ps_avd_sys)>;
resets = <&DIE_NODE(ps_avd_sys)>;
reg = <0x2 0xcd080000 0x0 0x12000>,
<0x2 0xcd092000 0x0 0x12000>,
<0x2 0xcd0a4000 0x0 0x4000>,
<0x2 0xcd100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&DIE_NODE(avd_dart) 0>;
};

DIE_NODE(avd_dart): iommu@2cd010000 {
compatible = "apple,t6031-dart", "apple,t8110-dart";
reg = <0x2 0xcd010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ DIE_NO 1192 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&DIE_NODE(ps_avd_sys)>;
};

DIE_NODE(sio_dart): iommu@391004000 {
compatible = "apple,t6031-dart", "apple,t8110-dart";
reg = <0x3 0x91004000 0x0 0x4000>;
Expand Down
24 changes: 24 additions & 0 deletions arch/arm64/boot/dts/apple/t8103.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,6 +1406,30 @@
};
};

avd: avd@268000000 {
compatible = "apple,t8103-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 540 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 541 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
resets = <&ps_avd_sys>;
reg = <0x2 0x69080000 0x0 0xc000>,
<0x2 0x6908c000 0x0 0xc000>,
<0x2 0x69098000 0x0 0x4000>,
<0x2 0x69100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&avd_dart 0>;
};

avd_dart: iommu@269010000 {
compatible = "apple,t8103-dart";
reg = <0x2 0x69010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 547 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
};

dispext0_dart: iommu@271304000 {
compatible = "apple,t8103-dart";
reg = <0x2 0x71304000 0x0 0x4000>;
Expand Down
29 changes: 28 additions & 1 deletion arch/arm64/boot/dts/apple/t8112.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,6 @@
label = "pmp-avd-sys";
#power-domain-cells = <0>;
power-domains = <&ps_avd_sys>;
status = "disabled";
};

pmp_report_msr: report@b {
Expand Down Expand Up @@ -1665,6 +1664,34 @@
#mbox-cells = <0>;
};

avd: avd@268000000 {
compatible = "apple,t8112-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 667 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 668 IRQ_TYPE_LEVEL_HIGH>;
#ifdef APPLE_USE_PMP
power-domains = <&pmp_report_avd_sys>;
#else
power-domains = <&ps_avd_sys>;
#endif
resets = <&ps_avd_sys>;
reg = <0x2 0x69080000 0x0 0x10000>,
<0x2 0x69090000 0x0 0x10000>,
<0x2 0x690a0000 0x0 0x4000>,
<0x2 0x69100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&avd_dart 0>;
};

avd_dart: iommu@269010000 {
compatible = "apple,t8110-dart";
reg = <0x2 0x69010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 674 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
};

dispext0_dart: iommu@271304000 {
compatible = "apple,t8112-dart", "apple,t8110-dart";
reg = <0x2 0x71304000 0x0 0x4000>;
Expand Down
24 changes: 24 additions & 0 deletions arch/arm64/boot/dts/apple/t8122.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,30 @@
power-domains = <&ps_sio_cpu>;
};

avd: avd@288000000 {
compatible = "apple,t8122-avd";
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 679 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 680 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
resets = <&ps_avd_sys>;
reg = <0x2 0x89080000 0x0 0x12000>,
<0x2 0x89092000 0x0 0x12000>,
<0x2 0x890a4000 0x0 0x4000>,
<0x2 0x89100000 0x0 0x10000>;
reg-names = "code", "sram", "mbox", "ctrl";
iommus = <&avd_dart 0>;
};

avd_dart: iommu@289010000 {
compatible = "apple,t8122-dart", "apple,t8110-dart";
reg = <0x2 0x89010000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 686 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_avd_sys>;
};

fpwm1: pwm@2a1044000 {
compatible = "apple,t8122-fpwm", "apple,s5l-fpwm";
reg = <0x2 0xa1044000 0x0 0x4000>;
Expand Down
2 changes: 2 additions & 0 deletions drivers/iommu/apple-dart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ apple_dart_setup_translation(struct apple_dart_domain *domain,
struct io_pgtable_cfg *pgtbl_cfg =
&io_pgtable_ops_to_pgtable(domain->pgtbl_ops)->cfg;

apple_dart_hw_reset(stream_map->dart);

for (i = 0; i < pgtbl_cfg->apple_dart_cfg.n_ttbrs; ++i) {
u64 ttbr = virt_to_phys(pgtbl_cfg->apple_dart_cfg.ttbr[i]);
apple_dart_hw_set_ttbr(stream_map, i, ttbr);
Expand Down
1 change: 1 addition & 0 deletions drivers/media/platform/apple/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
comment "Apple media platform drivers"

source "drivers/media/platform/apple/isp/Kconfig"
source "drivers/media/platform/apple/avd/Kconfig"
1 change: 1 addition & 0 deletions drivers/media/platform/apple/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only

obj-y += isp/
obj-y += avd/
13 changes: 13 additions & 0 deletions drivers/media/platform/apple/avd/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# SPDX-License-Identifier: GPL-2.0-only

config VIDEO_APPLE_AVD
tristate "Apple Silicon Video Decoding driver"
depends on VIDEO_DEV
depends on MEDIA_CONTROLLER
depends on ARCH_APPLE || COMPILE_TEST
depends on OF_ADDRESS
depends on V4L_PLATFORM_DRIVERS
select V4L2_MEM2MEM_DEV
select VIDEOBUF2_DMA_CONTIG
select V4L2_H264
select V4L2_VP9
4 changes: 4 additions & 0 deletions drivers/media/platform/apple/avd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only

apple-avd-y := avd-drv.o avd-v4l2.o avd-hw.o avd-h264.o avd-vp9.o
obj-$(CONFIG_VIDEO_APPLE_AVD) += apple-avd.o
Loading