From ba0d4eea3fb675c1b8d178663b1eb04579e34f84 Mon Sep 17 00:00:00 2001 From: Jian Cao Date: Wed, 3 Jul 2019 21:35:24 +0800 Subject: [PATCH] dts: add memory-region for gxm logo [1/1] PD#SWPL-5522 Problem: S912 display S912 Android P support for osd Solution: add memory-region for gxm logo Verify: verified on gxm-q201 Change-Id: If4efec47f939a944530ef1dc0f7a3b8abf245a47 Signed-off-by: Jian Cao --- arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts | 12 +++++++++++- arch/arm/boot/dts/amlogic/gxm_q201_1g.dts | 1 + arch/arm/boot/dts/amlogic/gxm_q201_2g.dts | 1 + arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts | 12 +++++++++++- arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts | 1 + arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts | 1 + 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index 79a1354..f3e39f1 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -70,6 +70,15 @@ reg = <0x05300000 0x2000000>; no-map; }; + + logo_reserved:linux,meson-fb { + compatible = "shared-dma-pool"; + reusable; + size = <0x800000>; + alignment = <0x400000>; + alloc-ranges = <0x7f800000 0x800000>; + }; + ion_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; @@ -751,6 +760,7 @@ meson-fb { compatible = "amlogic, meson-gxm"; + memory-region = <&logo_reserved>; dev_name = "meson-fb"; status = "okay"; interrupts = <0 3 1 @@ -764,7 +774,7 @@ display_size_default = <1920 1080 1920 3240 32>; /*1920*1080*4*3 = 0x17BB000*/ mem_alloc = <1>; - logo_addr = "0x7dc00000"; + logo_addr = "0x7f800000"; }; ge2d { compatible = "amlogic, ge2d-gxm"; diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts index 3065de0..91a5e72 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts @@ -759,6 +759,7 @@ meson-fb { compatible = "amlogic, meson-gxm"; + memory-region = <&logo_reserved>; dev_name = "meson-fb"; status = "okay"; interrupts = <0 3 1 diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts index bf70fee..d7b46da 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts @@ -762,6 +762,7 @@ meson-fb { compatible = "amlogic, meson-gxm"; + memory-region = <&logo_reserved>; dev_name = "meson-fb"; status = "okay"; interrupts = <0 3 1 diff --git a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts index f0f39e1..21dd87f0 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q200_2g_buildroot.dts @@ -70,6 +70,15 @@ reg = <0x0 0x05300000 0x0 0x2000000>; no-map; }; + + logo_reserved:linux,meson-fb { + compatible = "shared-dma-pool"; + reusable; + size = <0x0 0x800000>; + alignment = <0x0 0x400000>; + alloc-ranges = <0x0 0x7f800000 0x0 0x800000>; + }; + ion_reserved:linux,ion-dev { compatible = "shared-dma-pool"; reusable; @@ -751,6 +760,7 @@ meson-fb { compatible = "amlogic, meson-gxm"; + memory-region = <&logo_reserved>; dev_name = "meson-fb"; status = "okay"; interrupts = <0 3 1 @@ -764,7 +774,7 @@ display_size_default = <1920 1080 1920 3240 32>; /*1920*1080*4*3 = 0x17BB000*/ mem_alloc = <1>; - logo_addr = "0x7dc00000"; + logo_addr = "0x7f800000"; }; ge2d { compatible = "amlogic, ge2d-gxm"; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts index 2d237c2..3674acc 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts @@ -759,6 +759,7 @@ meson-fb { compatible = "amlogic, meson-gxm"; + memory-region = <&logo_reserved>; dev_name = "meson-fb"; status = "okay"; interrupts = <0 3 1 diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts index 38ac58f..0e464cb 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts @@ -762,6 +762,7 @@ meson-fb { compatible = "amlogic, meson-gxm"; + memory-region = <&logo_reserved>; dev_name = "meson-fb"; status = "okay"; interrupts = <0 3 1 -- 2.7.4