diff --git a/arch/arm64/boot/dts/amlogic/t5m_reva_t963d4_ay309_3g.dts b/arch/arm64/boot/dts/amlogic/t5m_reva_t963d4_ay309_3g.dts index 7a56ae457..1b542c71c 100644 --- a/arch/arm64/boot/dts/amlogic/t5m_reva_t963d4_ay309_3g.dts +++ b/arch/arm64/boot/dts/amlogic/t5m_reva_t963d4_ay309_3g.dts @@ -65,7 +65,7 @@ reusable; size = <0x0 0x800000>; alignment = <0x0 0x400000>; - reg = <0x0 0x7f800000 0x0 0x800000>; + reg = <0x0 0xbf800000 0x0 0x800000>; }; lcd_tcon_reserved:linux,lcd_tcon { @@ -1115,14 +1115,14 @@ status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000>; - logo_addr = "0x7f800000"; + logo_addr = "0xbf800000"; mem_alloc = <0>; pxp_mode = <1>; /** 0:normal mode 1:pxp mode */ }; &drm_vpu { status = "okay"; - logo_addr = "0x7f800000"; + logo_addr = "0xbf800000"; connectors_dev: port@1 { drm_to_lcd0: endpoint@2 { diff --git a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_2g.dts b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_2g.dts index 973221aec..32a805a98 100644 --- a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_2g.dts +++ b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_2g.dts @@ -70,7 +70,7 @@ reusable; size = <0x0 0x800000>; alignment = <0x0 0x400000>; - reg = <0x0 0x7f800000 0x0 0x800000>; + reg = <0x0 0x3f800000 0x0 0x800000>; }; lcd_tcon_reserved:linux,lcd_tcon { @@ -102,16 +102,17 @@ dmaheap_cma_reserved:heap-gfx { compatible = "shared-dma-pool"; reusable; - size = <0x0 0x10000000>; + size = <0x0 0x5400000>; alignment = <0x0 0x400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; dmaheap_fb_reserved:heap-fb { compatible = "shared-dma-pool"; reusable; - /* 1920x1080x4x6 round up 4M align */ - size = <0x0 0x3400000>; + /* 1920x1080x4x3 round up 4M align */ + size = <0x0 0x1c00000>; alignment = <0x0 0x400000>; - //alloc-ranges = <0x0 0x20000000 0x0 0x03400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; /* vdin0 CMA pool */ @@ -133,16 +134,16 @@ */ size = <0x0 0x01400000>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; /* ion_codec_mm max can alloc size 80M*/ - size = <0x0 0x13400000>; + size = <0x0 0x1b000000>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; + alloc-ranges = <0x0 0x23000000 0x0 0x1b000000>; linux,contiguous-region; }; @@ -160,7 +161,7 @@ size = <0x0 0x400000>; //size = <0x0 0x0>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x0 0x0 0x40000000>; + alloc-ranges = <0x0 0x0 0x0 0x23000000>; }; /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { @@ -228,7 +229,7 @@ }; fixed_area_gpu { compatible = "amlogic, fixed_area_cma"; - status = "okay"; + status = "disabled"; memory-region = <&fixed_area_one>; pool_size = <0x0 0x400000>; }; @@ -1013,14 +1014,14 @@ status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000>; - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; mem_alloc = <0>; pxp_mode = <1>; /** 0:normal mode 1:pxp mode */ }; &drm_vpu { status = "okay"; - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; connectors_dev: port@1 { drm_to_lcd0: endpoint@2 { diff --git a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_3g.dts b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_3g.dts index 4102bbdb6..f7bf17e68 100644 --- a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_3g.dts +++ b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay301_3g.dts @@ -70,7 +70,7 @@ reusable; size = <0x0 0x800000>; alignment = <0x0 0x400000>; - reg = <0x0 0xbf800000 0x0 0x800000>; + reg = <0x0 0x7f800000 0x0 0x800000>; }; lcd_tcon_reserved:linux,lcd_tcon { @@ -102,16 +102,17 @@ dmaheap_cma_reserved:heap-gfx { compatible = "shared-dma-pool"; reusable; - size = <0x0 0x10000000>; + size = <0x0 0x5400000>; alignment = <0x0 0x400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; }; dmaheap_fb_reserved:heap-fb { compatible = "shared-dma-pool"; reusable; - /* 1920x1080x4x6 round up 4M align */ - size = <0x0 0x3400000>; + /* 1920x1080x4x3 round up 4M align */ + size = <0x0 0x1c00000>; alignment = <0x0 0x400000>; - //alloc-ranges = <0x0 0x20000000 0x0 0x03400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; }; /* vdin0 CMA pool */ @@ -140,7 +141,7 @@ compatible = "shared-dma-pool"; reusable; /* ion_codec_mm max can alloc size 80M*/ - size = <0x0 0x1b000000>; + size = <0x0 0x1bc00000>; alignment = <0x0 0x400000>; alloc-ranges = <0x0 0x00000000 0x0 0x80000000>; linux,contiguous-region; @@ -228,7 +229,7 @@ }; fixed_area_gpu { compatible = "amlogic, fixed_area_cma"; - status = "okay"; + status = "disabled"; memory-region = <&fixed_area_one>; pool_size = <0x0 0x400000>; }; @@ -1014,14 +1015,14 @@ status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000>; - logo_addr = "0xbf800000"; + logo_addr = "0x7f800000"; mem_alloc = <0>; pxp_mode = <1>; /** 0:normal mode 1:pxp mode */ }; &drm_vpu { status = "okay"; - logo_addr = "0xbf800000"; + logo_addr = "0x7f800000"; connectors_dev: port@1 { drm_to_lcd0: endpoint@2 { diff --git a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_2g.dts b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_2g.dts index 77b8e1efd..10f9b124f 100644 --- a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_2g.dts +++ b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_2g.dts @@ -70,7 +70,7 @@ reusable; size = <0x0 0x800000>; alignment = <0x0 0x400000>; - reg = <0x0 0x7f800000 0x0 0x800000>; + reg = <0x0 0x3f800000 0x0 0x800000>; }; lcd_tcon_reserved:linux,lcd_tcon { @@ -102,16 +102,17 @@ dmaheap_cma_reserved:heap-gfx { compatible = "shared-dma-pool"; reusable; - size = <0x0 0x10000000>; + size = <0x0 0x5400000>; alignment = <0x0 0x400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; dmaheap_fb_reserved:heap-fb { compatible = "shared-dma-pool"; reusable; - /* 1920x1080x4x6 round up 4M align */ - size = <0x0 0x3400000>; + /* 1920x1080x4x3 round up 4M align */ + size = <0x0 0x1c00000>; alignment = <0x0 0x400000>; - //alloc-ranges = <0x0 0x20000000 0x0 0x03400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; /* vdin0 CMA pool */ @@ -133,16 +134,16 @@ */ size = <0x0 0x01400000>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; codec_mm_cma:linux,codec_mm_cma { compatible = "shared-dma-pool"; reusable; /* ion_codec_mm max can alloc size 80M*/ - size = <0x0 0x13400000>; + size = <0x0 0x1b000000>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; + alloc-ranges = <0x0 0x23000000 0x0 0x1b000000>; linux,contiguous-region; }; @@ -160,7 +161,7 @@ size = <0x0 0x400000>; //size = <0x0 0x0>; alignment = <0x0 0x400000>; - alloc-ranges = <0x0 0x0 0x0 0x40000000>; + alloc-ranges = <0x0 0x00000000 0x0 0x23000000>; }; /* codec shared reserved */ codec_mm_reserved:linux,codec_mm_reserved { @@ -228,7 +229,7 @@ }; fixed_area_gpu { compatible = "amlogic, fixed_area_cma"; - status = "okay"; + status = "disabled"; memory-region = <&fixed_area_one>; pool_size = <0x0 0x400000>; }; @@ -1119,14 +1120,14 @@ status = "disabled"; display_size_default = <1920 1080 1920 2160 32>; mem_size = <0x00800000 0x1980000 0x100000 0x100000>; - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; mem_alloc = <0>; pxp_mode = <1>; /** 0:normal mode 1:pxp mode */ }; &drm_vpu { status = "okay"; - logo_addr = "0x7f800000"; + logo_addr = "0x3f800000"; connectors_dev: port@1 { drm_to_lcd0: endpoint@2 { diff --git a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_3g.dts b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_3g.dts index a6ec89bce..763f5b8b5 100644 --- a/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_3g.dts +++ b/arch/arm64/boot/dts/amlogic/t5m_t963d4_ay309_3g.dts @@ -97,16 +97,17 @@ dmaheap_cma_reserved:heap-gfx { compatible = "shared-dma-pool"; reusable; - size = <0x0 0x10000000>; + size = <0x0 0x5400000>; alignment = <0x0 0x400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; }; dmaheap_fb_reserved:heap-fb { compatible = "shared-dma-pool"; reusable; - /* 1920x1080x4x6 round up 4M align */ - size = <0x0 0x3400000>; + /* 1920x1080x4x3 round up 4M align */ + size = <0x0 0x1c00000>; alignment = <0x0 0x400000>; - //alloc-ranges = <0x0 0x20000000 0x0 0x03400000>; + alloc-ranges = <0x0 0x00000000 0x0 0x40000000>; }; /* vdin0 CMA pool */ @@ -223,7 +224,7 @@ }; fixed_area_gpu { compatible = "amlogic, fixed_area_cma"; - status = "okay"; + status = "disabled"; memory-region = <&fixed_area_one>; pool_size = <0x0 0x400000>; };