From ea5227e64dbd48b214f1adcae699acf792202cea Mon Sep 17 00:00:00 2001 From: Luan Yuan Date: Mon, 17 Jun 2019 19:13:54 +0800 Subject: [PATCH] dts: logo addr overflows the max size in 1g platform.[1/1] PD#SWPL-9938 Problem: logo addr overflows the max size in 1g platform. Solution: fixed it Verify: verify by fermi Change-Id: Ic1edc545c702b10d88cd03ddc4b761f142457b43 Signed-off-by: Luan Yuan --- arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts | 2 +- arch/arm/boot/dts/amlogic/gxm_q201_1g.dts | 4 ++-- arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts | 2 +- arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts index 35bd14588f46..6bf742b3ae3e 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u200_1g.dts @@ -826,7 +826,7 @@ status = "okay"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; mem_alloc = <0>; pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ }; diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts index 038aab1502a9..9054994b5c10 100644 --- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts @@ -77,7 +77,7 @@ reusable; size = <0x800000>; alignment = <0x400000>; - alloc-ranges = <0x7f800000 0x800000>; + alloc-ranges = <0x3f800000 0x800000>; }; //don't put other dts in front of logo_reserved @@ -772,7 +772,7 @@ /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ display_size_default = <1920 1080 1920 3240 32>; /*1920*1080*4*3 = 0x17BB000*/ - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; }; ge2d { compatible = "amlogic, ge2d-gxm"; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts index 0b97338aa931..5631482cd2b1 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts @@ -820,7 +820,7 @@ status = "okay"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000 0x800000>; - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; mem_alloc = <0>; pxp_mode = <0>; /** 0:normal mode 1:pxp mode */ }; diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts index fb72d097f10b..e235e457ac3d 100644 --- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts @@ -77,7 +77,7 @@ reusable; size = <0x0 0x800000>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x7f800000 0x0 0x800000>; + alloc-ranges = <0x0 0x3f800000 0x0 0x800000>; }; //don't put other dts in front of logo_reserved @@ -772,7 +772,7 @@ /** 0:VPU free scale 1:OSD free scale 2:OSD super scale */ display_size_default = <1920 1080 1920 3240 32>; /*1920*1080*4*3 = 0x17BB000*/ - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; }; ge2d { compatible = "amlogic, ge2d-gxm";