Merge pull request torvalds#87 from 96boards/revert-85-vblank

Revert "enbable vblank event and reserve 128MB memory for graphic usage"
hzhuang1 · Jun 23, 2015 · cdf95d5 · cdf95d5
2 parents a50f5d0 + fe25b44
commit cdf95d5
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 229 deletions.
diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts
@@ -41,22 +41,6 @@
 		reg = <0x0 0x00000000 0x0 0x40000000>;
 	};
 
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		/* global autoconfigured region for contiguous allocations
-		 * e.g. for graphic usage */
-		linux,cma {
-			compatible = "shared-dma-pool";
-			reusable;
-			size = <0x0 0x8000000>;		/* 128M */
-			alignment = <0x0 0x2000>;	/* 4k page alignment */
-			linux,cma-default;
-		};
-	};
-
 	smb {
 		uart0: uart@f8015000 {	/* console */
 			status = "ok";
@@ -210,20 +194,4 @@
 		startup-delay-us = <70000>;
 		enable-active-high;
 	};
-
-        hisi-ion@0 {
-                compatible = "hisilicon,ion";
-
-                heap_sys_user@0 {
-                        heap-name = "sys_user";
-                        heap-range = <0x0 0x0>;
-                        heap-type = "ion_system";
-                };
-
-                heap_sys_contig@0 {
-                        heap-name = "sys_contig";
-                        heap-range = <0x0 0x0>;
-                        heap-type = "ion_system_contig";
-                };
-        };
 };
diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi
@@ -685,7 +685,6 @@
 			#address-cells = <2>;
 			#size-cells = <2>;
 			ranges;
-			dma-coherent;
 
 			ade: ade@f4100000 {
 				compatible = "hisilicon,hi6220-ade";
@@ -704,10 +703,7 @@
 					       "clk_ade_pix",
 					       "clk_syspll_src",
 					       "clk_medpll_src";
-
-				interrupts = <0 115 4>;
-
-				/*ade core clock rate*/
+				 /*ade core clock rate*/
 				ade_core_clk_rate = <360000000>;
 				 /*media_noc clock rate*/
 				media_noc_clk_rate = <288000000>;
@@ -960,10 +956,57 @@
                 };
 	};
 
+        hisi-ion@0 {
+                compatible = "hisilicon,ion";
+                memreserve_base = <0x1ff00000>;
+                memreserve_size = <0x18d00000>;
+
+                heap_fb@0 {
+                        heap-name = "fb";
+                        heap-range = <0x37300000 0x01900000>;
+                        heap-type = "ion_carveout";
+                };
+
+                heap_vpu@0 {
+                        heap-name = "vpu";
+                        heap-range = <0x34200000 0x03100000>;
+                        heap-type = "ion_carveout";
+                };
+
+                heap_jpu@0 {
+                        heap-name = "jpu";
+                        heap-range = <0x33100000 0x01100000>;
+                        heap-type = "ion_carveout";
+                };
+
+                heap_gralloc@0 {
+                        heap-name = "gralloc-carveout";
+                        heap-range = <0x27b00000 0x0b600000>;
+                        heap-type = "ion_carveout";
+                };
+
+                heap_overlay@0 {
+                        heap-name = "overlay";
+                        heap-range = <0x1ff00000 0x07c00000>;
+                        heap-type = "ion_carveout";
+                };
+
+                heap_sys_user@0 {
+                        heap-name = "sys_user";
+                        heap-range = <0x0 0x0>;
+                        heap-type = "ion_system";
+                };
+
+                heap_sys_contig@0 {
+                        heap-name = "sys_contig";
+                        heap-range = <0x0 0x0>;
+                        heap-type = "ion_system_contig";
+                };
+        };
+
 	mali:mali@f4080000 {
 		compatible = "arm,mali-450", "arm,mali-utgard";
 		reg = <0x0 0x3f100000 0x0 0x00708000>;
-		dma-coherent;
 		clocks = <&clock_media HI6220_G3D_CLK>,
 			 <&clock_media HI6220_G3D_PCLK>;
 		clock-names = "clk_g3d", "pclk_g3d";

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
@@ -269,7 +269,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MALI400=m
-CONFIG_MALI400_DEBUG=y
 CONFIG_MALI450=y
 # CONFIG_MALI400_PROFILING is not set
 # CONFIG_MALI_DVFS is not set
@@ -279,6 +278,7 @@ CONFIG_MALI_PLAT_SPECIFIC_DT=y
 CONFIG_DRM=y
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_HISI=y
+CONFIG_ION=y
 CONFIG_ION_HISI=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FRAMEBUFFER_CONSOLE=y

diff --git a/drivers/gpu/arm/utgard/linux/mali_memory_external.c b/drivers/gpu/arm/utgard/linux/mali_memory_external.c
@@ -47,12 +47,10 @@ _mali_osk_errcode_t _mali_ukk_map_external_mem(_mali_uk_map_external_mem_s *args
 			  args->phys_addr, (args->phys_addr + args->size - 1),
 			  args->mali_address));
 
-#if 0
 	/* Validate the mali physical range */
 	if (_MALI_OSK_ERR_OK != mali_mem_validation_check(args->phys_addr, args->size)) {
 		return _MALI_OSK_ERR_FAULT;
 	}
-#endif
 
 	descriptor = mali_mem_descriptor_create(session, MALI_MEM_EXTERNAL);
 	if (NULL == descriptor) MALI_ERROR(_MALI_OSK_ERR_NOMEM);