From cc2d83d47f14b049918ec5667237734d45b95ac2 Mon Sep 17 00:00:00 2001 From: "changqing.gao" Date: Mon, 29 Jul 2019 13:53:02 +0800 Subject: [PATCH] dts: sm1: camera preview would cause garbage [1/1] PD#SWPL-11884 Problem: camera preview would cause garbage. Solution: modify the previous change:38e45fb998269d36f41a7b004be51ba9f1e7bef9 not to remove vdin0_cma_reserved. Verify: test passed on sm1 Change-Id: Ie20de9b3562f7c83fa73bd88acab7770ca8c3b0a Signed-off-by: changqing.gao --- arch/arm/boot/dts/amlogic/sm1_pxp.dts | 14 +++++++------- arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts | 14 +++++++------- .../dts/amlogic/sm1_s905d3_ac200_buildroot.dts | 14 +++++++------- arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts | 14 +++++++------- arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 14 +++++++------- arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts | 14 +++++++------- arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts | 14 +++++++------- .../dts/amlogic/sm1_s905x3_ac213_buildroot.dts | 14 +++++++------- arch/arm64/boot/dts/amlogic/sm1_pxp.dts | 14 +++++++------- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts | 14 +++++++------- .../dts/amlogic/sm1_s905d3_ac200_buildroot.dts | 14 +++++++------- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts | 14 +++++++------- .../arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 14 +++++++------- arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts | 14 +++++++------- arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts | 14 +++++++------- .../dts/amlogic/sm1_s905x3_ac213_buildroot.dts | 14 +++++++------- 16 files changed, 112 insertions(+), 112 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/sm1_pxp.dts b/arch/arm/boot/dts/amlogic/sm1_pxp.dts index a6df1e21905f..c9846a9d9931 100644 --- a/arch/arm/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm/boot/dts/amlogic/sm1_pxp.dts @@ -120,13 +120,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -713,7 +713,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts index 676ba0cf8ec8..507ad15cabc7 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1696,7 +1696,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts index 621ae936a37d..2ec713e576ea 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts @@ -127,13 +127,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1771,7 +1771,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts index cb11859f4373..99155135d008 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1713,7 +1713,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts index 7d0e7b3d0016..9f7f5d8d8bf8 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1713,7 +1713,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts index 862a97c246b0..fc1418ed30f0 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1704,7 +1704,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts index 80a64fb7226c..d69a18211b5f 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -136,13 +136,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1621,7 +1621,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts index cd97887be9a6..6b72b890832b 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts @@ -127,13 +127,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x04000000>; - // alignment = <0x400000>; - //}; + size = <0x04000000>; + alignment = <0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1700,7 +1700,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts index 77b6dd4e31d7..8f417fde16c8 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts @@ -121,13 +121,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -715,7 +715,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts index f95599c614b8..96cdb0ba3d13 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1679,7 +1679,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts index d5b20200450a..189009533320 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_buildroot.dts @@ -125,13 +125,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1758,7 +1758,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts index 796053d04e3a..f83e7b540b79 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1711,7 +1711,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts index f9ba7e91ac14..e08ae57c2968 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1712,7 +1712,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts index 0369344cda7b..3e5f31a38927 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1702,7 +1702,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts index 07096e3321fe..f59f6d90060a 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -134,13 +134,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1684,7 +1684,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts index cfa30006a892..468506ad60d1 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213_buildroot.dts @@ -125,13 +125,13 @@ //no-map; }; /* vdin0 CMA pool */ - //vdin0_cma_reserved:linux,vdin0_cma { - // compatible = "shared-dma-pool"; - // reusable; + vdin0_cma_reserved:linux,vdin0_cma { + compatible = "shared-dma-pool"; + reusable; /* 1920x1080x2x4 =16+4 M */ - // size = <0x0 0x04000000>; - // alignment = <0x0 0x400000>; - //}; + size = <0x0 0x04000000>; + alignment = <0x0 0x400000>; + }; /* vdin1 CMA pool */ vdin1_cma_reserved:linux,vdin1_cma { compatible = "shared-dma-pool"; @@ -1776,7 +1776,7 @@ /*if you want to use vdin just modify status to "ok"*/ &vdin0 { - /*memory-region = <&vdin0_cma_reserved>;*/ + memory-region = <&vdin0_cma_reserved>; status = "okay"; /*vdin write mem color depth support: *bit0:support 8bit