Skip to content
Snippets Groups Projects
Commit 6b91438d authored by Hongguang Chen's avatar Hongguang Chen Committed by Android Partner Code Review
Browse files

Merge "ion: add fb heap for hw-fb [1/1]" into android-tv-deadpool-4.9-android12

parents cb486cb4 9415c233
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 140 additions and 0 deletions
arch/arm64/boot/dts/amlogic/g12a_pxp.dts
+ 7
− 0
View file @ 6b91438d
...@@ -72,6 +72,13 @@ ...@@ -72,6 +72,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
+ 7
− 0
View file @ 6b91438d
...@@ -89,6 +89,13 @@ ...@@ -89,6 +89,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+ 7
− 0
View file @ 6b91438d
...@@ -80,6 +80,13 @@ ...@@ -80,6 +80,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
+ 7
− 0
View file @ 6b91438d
...@@ -90,6 +90,13 @@ ...@@ -90,6 +90,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+ 7
− 0
View file @ 6b91438d
...@@ -89,6 +89,13 @@ ...@@ -89,6 +89,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot.dts
+ 7
− 0
View file @ 6b91438d
...@@ -79,6 +79,13 @@ ...@@ -79,6 +79,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_buildroot_vccktest.dts
+ 7
− 0
View file @ 6b91438d
...@@ -78,6 +78,13 @@ ...@@ -78,6 +78,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_drm_buildroot.dts
+ 7
− 0
View file @ 6b91438d
...@@ -80,6 +80,13 @@ ...@@ -80,6 +80,13 @@
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
no-kernel-map; no-kernel-map;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
+ 7
− 0
View file @ 6b91438d
...@@ -90,6 +90,13 @@ ...@@ -90,6 +90,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+ 7
− 0
View file @ 6b91438d
...@@ -89,6 +89,13 @@ ...@@ -89,6 +89,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
+ 7
− 0
View file @ 6b91438d
...@@ -88,6 +88,13 @@ ...@@ -88,6 +88,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
+ 7
− 0
View file @ 6b91438d
...@@ -89,6 +89,13 @@ ...@@ -89,6 +89,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
+ 7
− 0
View file @ 6b91438d
...@@ -87,6 +87,13 @@ ...@@ -87,6 +87,13 @@
size = <0x0 0x4000000>; size = <0x0 0x4000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_buildroot.dts
+ 7
− 0
View file @ 6b91438d
...@@ -79,6 +79,13 @@ ...@@ -79,6 +79,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+ 7
− 0
View file @ 6b91438d
...@@ -88,6 +88,13 @@ ...@@ -88,6 +88,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+ 7
− 0
View file @ 6b91438d
...@@ -89,6 +89,13 @@ ...@@ -89,6 +89,13 @@
size = <0x0 0x4C00000>; size = <0x0 0x4C00000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_buildroot.dts
+ 7
− 0
View file @ 6b91438d
...@@ -78,6 +78,13 @@ ...@@ -78,6 +78,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_drm_buildroot.dts
+ 7
− 0
View file @ 6b91438d
...@@ -80,6 +80,13 @@ ...@@ -80,6 +80,13 @@
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
no-kernel-map; no-kernel-map;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x0000000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905x2_u215.dts
+ 7
− 0
View file @ 6b91438d
...@@ -88,6 +88,13 @@ ...@@ -88,6 +88,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
arch/arm64/boot/dts/amlogic/g12a_s905y2_deadpool.dts
+ 7
− 0
View file @ 6b91438d
...@@ -87,6 +87,13 @@ ...@@ -87,6 +87,13 @@
size = <0x0 0x8000000>; size = <0x0 0x8000000>;
alignment = <0x0 0x400000>; alignment = <0x0 0x400000>;
}; };
ion_fb_reserved:linux,ion-fb {
compatible = "amlogic, ion-fb-mem";
reusable;
/* 1920x1080x4x3 round up 4M align */
size = <0x0 0x1c00000>;
alignment = <0x0 0x400000>;
};
//di_reserved:linux,di { //di_reserved:linux,di {
//compatible = "amlogic, di-mem"; //compatible = "amlogic, di-mem";
/* buffer_size = 3621952(yuv422 8bit) */ /* buffer_size = 3621952(yuv422 8bit) */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment