Skip to content

Commit 63aca01

Browse files
Pengcheng Chenakiernan
Pengcheng Chen
authored and
akiernan
committed
osd: create logo_reserved node in dts in Android O
PD#150868: create logo_reserved node in dts in Android O Change-Id: I4057aef2e40504920a9d3b086d31d96aa23bb52f Signed-off-by: Pengcheng Chen <[email protected]>
1 parent e14b754 commit 63aca01

File tree

14 files changed

+123
-78
lines changed

14 files changed

+123
-78
lines changed

‎arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,13 @@
7777
size = <0x0 0x2000000>;
7878
alignment = <0x0 0x400000>;
7979
};
80-
80+
logo_reserved:linux,meson-fb {
81+
compatible = "shared-dma-pool";
82+
reusable;
83+
size = <0x0 0x800000>;
84+
alignment = <0x0 0x400000>;
85+
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
86+
};
8187
ion_reserved:linux,ion-dev {
8288
compatible = "shared-dma-pool";
8389
reusable;
@@ -694,19 +700,20 @@
694700

695701
meson-fb {
696702
compatible = "amlogic, meson-fb";
703+
memory-region = <&logo_reserved>;
697704
dev_name = "meson-fb";
698705
status = "okay";
699706
interrupts = <0 3 1
700707
0 89 1>;
701708
interrupt-names = "viu-vsync", "rdma";
702-
mem_size = <0x006AF000 0x01851000 0x00100000>;
703-
/* uboot logo,fb0/fb1 memory size */
709+
mem_size = <0x00800000 0x01800000 0x00100000>;
710+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
704711
display_mode_default = "1080p60hz";
705712
scale_mode = <1>;
706713
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
707714
display_size_default = <1920 1080 1920 3240 32>;
708715
/*1920*1080*4*3 = 0x17BB000*/
709-
logo_addr = "0x3e000000";
716+
logo_addr = "0x3f800000";
710717
};
711718
ge2d {
712719
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p212_1g_buildroot.dts‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
serial4 = &uart_AO_B;
3636
};
3737

38-
ion_dev {
39-
compatible = "amlogic, ion_dev";
40-
memory-region = <&ion_reserved>;
41-
};
42-
4338
memory@00000000 {
4439
device_type = "memory";
4540
linux,usable-memory = <0x0 0x0100000 0x0 0x3ff00000>;
@@ -77,14 +72,13 @@
7772
size = <0x0 0x2000000>;
7873
alignment = <0x0 0x400000>;
7974
};
80-
81-
ion_reserved:linux,ion-dev {
75+
fb_reserved:linux,meson-fb {
8276
compatible = "shared-dma-pool";
8377
reusable;
84-
size = <0x0 0x7000000>;
78+
size = <0x0 0x2400000>;
8579
alignment = <0x0 0x400000>;
80+
alloc-ranges = <0x0 0x3dc00000 0x0 0x2400000>;
8681
};
87-
8882
/* vdin0 CMA pool */
8983
//vdin0_cma_reserved:linux,vdin0_cma {
9084
// compatible = "shared-dma-pool";
@@ -693,19 +687,20 @@
693687

694688
meson-fb {
695689
compatible = "amlogic, meson-fb";
690+
memory-region = <&fb_reserved>;
696691
dev_name = "meson-fb";
697692
status = "okay";
698693
interrupts = <0 3 1
699694
0 89 1>;
700695
interrupt-names = "viu-vsync", "rdma";
701-
mem_size = <0x006AF000 0x01851000 0x00100000>;
702-
/* uboot logo,fb0/fb1 memory size */
696+
mem_size = <0x00800000 0x1800000 0x00100000>;
697+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
703698
display_mode_default = "1080p60hz";
704699
scale_mode = <1>;
705700
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
706701
display_size_default = <1920 1080 1920 3240 32>;
707702
/*1920*1080*4*3 = 0x17BB000*/
708-
logo_addr = "0x3e000000";
703+
logo_addr = "0x3dc00000";
709704
};
710705
ge2d {
711706
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@
8686
size = <0x0 0x2000000>;
8787
alignment = <0x0 0x400000>;
8888
};
89-
89+
logo_reserved:linux,meson-fb {
90+
compatible = "shared-dma-pool";
91+
reusable;
92+
size = <0x0 0x800000>;
93+
alignment = <0x0 0x400000>;
94+
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
95+
};
9096
ion_reserved:linux,ion-dev {
9197
compatible = "shared-dma-pool";
9298
reusable;
@@ -703,19 +709,20 @@
703709

704710
meson-fb {
705711
compatible = "amlogic, meson-fb";
712+
memory-region = <&logo_reserved>;
706713
dev_name = "meson-fb";
707714
status = "okay";
708715
interrupts = <0 3 1
709716
0 89 1>;
710717
interrupt-names = "viu-vsync", "rdma";
711-
mem_size = <0x006AF000 0x01851000 0x00100000>;
712-
/* uboot logo,fb0/fb1 memory size */
718+
mem_size = <0x00800000 0x01800000 0x00100000>;
719+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
713720
display_mode_default = "1080p60hz";
714721
scale_mode = <1>;
715722
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
716723
display_size_default = <1920 1080 1920 3240 32>;
717724
/*1920*1080*4*3 = 0x17BB000*/
718-
logo_addr = "0x7e000000";
725+
logo_addr = "0x7f800000";
719726
};
720727
ge2d {
721728
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p212_2g_buildroot.dts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
serial4 = &uart_AO_B;
3737
};
3838

39-
ion_dev {
40-
compatible = "amlogic, ion_dev";
41-
memory-region = <&ion_reserved>;
42-
};
43-
4439
memory@00000000 {
4540
device_type = "memory";
4641
linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
@@ -78,12 +73,12 @@
7873
size = <0x0 0x2000000>;
7974
alignment = <0x0 0x400000>;
8075
};
81-
82-
ion_reserved:linux,ion-dev {
76+
fb_reserved:linux,meson-fb {
8377
compatible = "shared-dma-pool";
8478
reusable;
85-
size = <0x0 0x7000000>;
79+
size = <0x0 0x2400000>;
8680
alignment = <0x0 0x400000>;
81+
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
8782
};
8883

8984
/* vdin0 CMA pool */
@@ -695,19 +690,20 @@
695690

696691
meson-fb {
697692
compatible = "amlogic, meson-fb";
693+
memory-region = <&fb_reserved>;
698694
dev_name = "meson-fb";
699695
status = "okay";
700696
interrupts = <0 3 1
701697
0 89 1>;
702698
interrupt-names = "viu-vsync", "rdma";
703-
mem_size = <0x006AF000 0x01851000 0x00100000>;
704-
/* uboot logo,fb0/fb1 memory size */
699+
mem_size = <0x00800000 0x1800000 0x00100000>;
700+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
705701
display_mode_default = "1080p60hz";
706702
scale_mode = <1>;
707703
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
708704
display_size_default = <1920 1080 1920 3240 32>;
709705
/*1920*1080*4*3 = 0x17BB000*/
710-
logo_addr = "0x7e000000";
706+
logo_addr = "0x7dc00000";
711707
};
712708
ge2d {
713709
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@
7878
size = <0x0 0x2000000>;
7979
alignment = <0x0 0x400000>;
8080
};
81-
81+
logo_reserved:linux,meson-fb {
82+
compatible = "shared-dma-pool";
83+
reusable;
84+
size = <0x0 0x800000>;
85+
alignment = <0x0 0x400000>;
86+
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
87+
};
8288
ion_reserved:linux,ion-dev {
8389
compatible = "shared-dma-pool";
8490
reusable;
@@ -687,19 +693,20 @@
687693

688694
meson-fb {
689695
compatible = "amlogic, meson-fb";
696+
memory-region = <&logo_reserved>;
690697
dev_name = "meson-fb";
691698
status = "okay";
692699
interrupts = <0 3 1
693700
0 89 1>;
694701
interrupt-names = "viu-vsync", "rdma";
695-
mem_size = <0x006AF000 0x01851000 0x00100000>;
696-
/* uboot logo,fb0/fb1 memory size */
702+
mem_size = <0x00800000 0x01800000 0x00100000>;
703+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
697704
display_mode_default = "1080p60hz";
698705
scale_mode = <1>;
699706
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
700707
display_size_default = <1920 1080 1920 3240 32>;
701708
/*1920*1080*4*3 = 0x17BB000*/
702-
logo_addr = "0x7e000000";
709+
logo_addr = "0x7f800000";
703710
};
704711
ge2d {
705712
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p231_1g.dts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@
7878
size = <0x0 0x2000000>;
7979
alignment = <0x0 0x400000>;
8080
};
81-
81+
logo_reserved:linux,meson-fb {
82+
compatible = "shared-dma-pool";
83+
reusable;
84+
size = <0x0 0x800000>;
85+
alignment = <0x0 0x400000>;
86+
alloc-ranges = <0x0 0x3f800000 0x0 0x800000>;
87+
};
8288
ion_reserved:linux,ion-dev {
8389
compatible = "shared-dma-pool";
8490
reusable;
@@ -632,19 +638,20 @@
632638

633639
meson-fb {
634640
compatible = "amlogic, meson-fb";
641+
memory-region = <&logo_reserved>;
635642
dev_name = "meson-fb";
636643
status = "okay";
637644
interrupts = <0 3 1
638645
0 89 1>;
639646
interrupt-names = "viu-vsync", "rdma";
640-
mem_size = <0x006AF000 0x01851000 0x00100000>;
641-
/* uboot logo,fb0/fb1 memory size */
647+
mem_size = <0x00800000 0x01800000 0x00100000>;
648+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
642649
display_mode_default = "1080p60hz";
643650
scale_mode = <1>;
644651
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
645652
display_size_default = <1920 1080 1920 3240 32>;
646653
/*1920*1080*4*3 = 0x17BB000*/
647-
logo_addr = "0x3e000000";
654+
logo_addr = "0x3f800000";
648655
};
649656
ge2d {
650657
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p231_2g.dts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,13 @@
7878
size = <0x0 0x2000000>;
7979
alignment = <0x0 0x400000>;
8080
};
81-
81+
logo_reserved:linux,meson-fb {
82+
compatible = "shared-dma-pool";
83+
reusable;
84+
size = <0x0 0x800000>;
85+
alignment = <0x0 0x400000>;
86+
alloc-ranges = <0x0 0x7f800000 0x0 0x800000>;
87+
};
8288
ion_reserved:linux,ion-dev {
8389
compatible = "shared-dma-pool";
8490
reusable;
@@ -632,19 +638,20 @@
632638

633639
meson-fb {
634640
compatible = "amlogic, meson-fb";
641+
memory-region = <&logo_reserved>;
635642
dev_name = "meson-fb";
636643
status = "okay";
637644
interrupts = <0 3 1
638645
0 89 1>;
639646
interrupt-names = "viu-vsync", "rdma";
640-
mem_size = <0x006AF000 0x01851000 0x00100000>;
641-
/* uboot logo,fb0/fb1 memory size */
647+
mem_size = <0x00800000 0x01800000 0x00100000>;
648+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000*/
642649
display_mode_default = "1080p60hz";
643650
scale_mode = <1>;
644651
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
645652
display_size_default = <1920 1080 1920 3240 32>;
646653
/*1920*1080*4*3 = 0x17BB000*/
647-
logo_addr = "0x7e000000";
654+
logo_addr = "0x7f800000";
648655
};
649656
ge2d {
650657
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p231_2g_buildroot.dts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
serial4 = &uart_AO_B;
3737
};
3838

39-
ion_dev {
40-
compatible = "amlogic, ion_dev";
41-
memory-region = <&ion_reserved>;
42-
};
43-
4439
memory@00000000 {
4540
device_type = "memory";
4641
linux,usable-memory = <0x0 0x0100000 0x0 0x7ff00000>;
@@ -78,12 +73,12 @@
7873
size = <0x0 0x2000000>;
7974
alignment = <0x0 0x400000>;
8075
};
81-
82-
ion_reserved:linux,ion-dev {
76+
fb_reserved:linux,meson-fb {
8377
compatible = "shared-dma-pool";
8478
reusable;
85-
size = <0x0 0x7000000>;
79+
size = <0x0 0x2400000>;
8680
alignment = <0x0 0x400000>;
81+
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
8782
};
8883

8984
/* vdin0 CMA pool */
@@ -633,19 +628,20 @@
633628

634629
meson-fb {
635630
compatible = "amlogic, meson-fb";
631+
memory-region = <&fb_reserved>;
636632
dev_name = "meson-fb";
637633
status = "okay";
638634
interrupts = <0 3 1
639635
0 89 1>;
640636
interrupt-names = "viu-vsync", "rdma";
641-
mem_size = <0x006AF000 0x01851000 0x00100000>;
642-
/* uboot logo,fb0/fb1 memory size */
637+
mem_size = <0x00800000 0x1800000 0x00100000>;
638+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
643639
display_mode_default = "1080p60hz";
644640
scale_mode = <1>;
645641
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
646642
display_size_default = <1920 1080 1920 3240 32>;
647643
/*1920*1080*4*3 = 0x17BB000*/
648-
logo_addr = "0x7e000000";
644+
logo_addr = "0x7dc00000";
649645
};
650646
ge2d {
651647
compatible = "amlogic, ge2d";

‎arch/arm64/boot/dts/amlogic/gxl_p400_2g.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
fb_reserved:linux,meson-fb {
6363
compatible = "shared-dma-pool";
6464
reusable;
65-
size = <0x0 0x2000000>;
65+
size = <0x0 0x2400000>;
6666
alignment = <0x0 0x400000>;
67-
alloc-ranges = <0x0 0x7e000000 0x0 0x2000000>;
67+
alloc-ranges = <0x0 0x7dc00000 0x0 0x2400000>;
6868
};
6969

7070

@@ -473,14 +473,14 @@
473473
interrupts = <0 3 1
474474
0 89 1>;
475475
interrupt-names = "viu-vsync", "rdma";
476-
mem_size = <0x006AF000 0x01851000 0x00100000>;
477-
/* uboot logo,fb0/fb1 memory size */
476+
mem_size = <0x00800000 0x01800000 0x00100000>;
477+
/* uboot logo,fb0/fb1 memory size,if afbcd fb0=0x01851000 */
478478
display_mode_default = "1080p60hz";
479479
scale_mode = <1>;
480480
/** 0:VPU free scale 1:OSD free scale 2:OSD super scale */
481481
display_size_default = <1920 1080 1920 3240 32>;
482482
/*1920*1080*4*3 = 0x17BB000*/
483-
logo_addr = "0x7e000000";
483+
logo_addr = "0x7dc00000";
484484
};
485485

486486
ge2d {

0 commit comments

Comments
 (0)