hardware_self_adapt: squashed commit to add framebuffer hack for u8815

Enables the use of this kernel and the 2030 RIL (with 109808 libcm.so) on the Gingerbread bootloader.

Enable for u8815 (which it actually affects) and leave disabled for u8833.

Author: Daz Jones

arch/arm/configs/u8815_defconfig

@@ -511,6 +511,7 @@ CONFIG_HUAWEI_SMEM_SLEEP_LOG=y
 CONFIG_HUAWEI_VIBRATOR_INTENSITY_SYSFS=y
 CONFIG_HUAWEI_BT_BCM43XX=y
 # CONFIG_HUAWEI_BT_WCN2243 is not set
+CONFIG_FRAMEBUF_SELF_ADAPT_HACK=y
 
 #
 # System MMU

arch/arm/configs/u8833_defconfig

@@ -514,6 +514,7 @@ CONFIG_HUAWEI_SMEM_SLEEP_LOG=y
 CONFIG_HUAWEI_VIBRATOR_INTENSITY_SYSFS=y
 # CONFIG_HUAWEI_BT_BCM43XX is not set
 CONFIG_HUAWEI_BT_WCN2243=y
+# CONFIG_FRAMEBUF_SELF_ADAPT_HACK is not set
 
 #
 # System MMU

arch/arm/mach-msm/Kconfig

@@ -2763,3 +2763,12 @@ config HUAWEI_BT_WCN2243
 	default n
 	help
 	  Select Y to use Qualcomm's BlueZ stack. Used by WCN2243. Not used in Huawei devices.
+
+config FRAMEBUF_SELF_ADAPT_HACK
+	bool "Huawei framebuffer memory hack"
+	depends on FRAMEBUF_SELF_ADAPT
+	default n
+	help
+	  Select Y to add an extra 2^20 to the framebuffer memory region determined by Huawei's
+	  bootloader if the space is too small for the framebuffer. This is useful for booting on
+	  the Gingerbread bootloader.

arch/arm/mach-msm/hardware_self_adapt.c

@@ -29,6 +29,11 @@ static __u32	frame_buffer_size = 0;
 static __u32	frame_buffer_start = 0;	/* physical start address */
 #endif
 
+#ifdef CONFIG_FRAMEBUF_SELF_ADAPT_HACK
+#define BL_BUF_BLOCK 1048576
+static bool frame_buffer_boosted = false;
+#endif
+
 /* cust size self adapter */
 static __u32	cust_buffer_size = 0;
 static __u32	cust_buffer_start = 0;	/* physical start address */
@@ -92,8 +97,15 @@ __tagtable(ATAG_CHARGE_FLAG, parse_tag_charge_flag);
 #define ATAG_FRAME_BUFFER_ID 0x4d534D79
 int __init parse_tag_frame_buffer(const struct tag *tags)
 {
-	frame_buffer_size = tags->u.mem.size;
-	frame_buffer_start = tags->u.mem.start;
+    frame_buffer_size = tags->u.mem.size;
+#ifdef CONFIG_FRAMEBUF_SELF_ADAPT_HACK
+    if(frame_buffer_size < 6 * BL_BUF_BLOCK)
+    {
+        frame_buffer_size += BL_BUF_BLOCK;
+        frame_buffer_boosted = true;
+    }
+#endif
+    frame_buffer_start = tags->u.mem.start;
 
     printk(KERN_DEBUG "%s: fb addr= 0x%x, size=0x%0x\n", __func__, frame_buffer_start, frame_buffer_size);
     return 0;
@@ -125,9 +137,13 @@ void get_frame_buffer_mem_region(__u32 *start_addr, __u32 *size)
 #define ATAG_CUST_BUFFER_ID 0x4d534D7B
 int __init parse_tag_cust_buffer(const struct tag * tags)
 {
-	cust_buffer_size = tags->u.mem.size;
-	cust_buffer_start = tags->u.mem.start;
-	
+    cust_buffer_size = tags->u.mem.size;
+    cust_buffer_start = tags->u.mem.start;
+#ifdef CONFIG_FRAMEBUF_SELF_ADAPT_HACK
+    if(frame_buffer_boosted)
+        cust_buffer_start += BL_BUF_BLOCK;
+#endif
+
     printk(KERN_DEBUG "%s: cust addr= 0x%x, size=0x%0x\n", __func__, cust_buffer_start, cust_buffer_size);
     return 0;
 }
@@ -230,6 +246,24 @@ char *get_bt_device_name(void)
 	return bt_device_array[i].dev_name;
 } 
 
+char *get_framebuffer_boosted(void)
+{
+  char *framebuffer_boosted = NULL;
+#ifdef CONFIG_FRAMEBUF_SELF_ADAPT_HACK
+  if(frame_buffer_boosted)
+  {
+    framebuffer_boosted = "1";
+  }
+  else
+  {
+#endif
+    framebuffer_boosted = "0";
+#ifdef CONFIG_FRAMEBUF_SELF_ADAPT_HACK
+  }
+#endif
+  return framebuffer_boosted;
+}
+
 /* modify spk mic function name */
 /* Add DTS property */
 /* add special requirement for U8951-1/-51 */

fs/proc/app_info.c

@@ -388,28 +388,30 @@ static int app_version_read_proc(char *page, char **start, off_t off,
 	char * battery_name = NULL;
 	char *wifi_device_name = NULL;
 	char *bt_device_name = NULL;
+	char *framebuffer_boosted = NULL;
 	char audio_property[AUDIO_PROPERTY_LEN] = {0};
 	/*print sensor info into app_info*/
 	/* Array **_**_id must be large enough to hold both id and sub id */
 	/* 'cause the following code would call strcat function to connect */
 	/* sub id to array **_**_id[] */
 	char s_board_id[BOARD_ID_LEN + BOARD_ID_SUB_VER_LEN] = {0};
-    char sub_ver[BOARD_ID_SUB_VER_LEN] = {0};
+	char sub_ver[BOARD_ID_SUB_VER_LEN] = {0};
 	char hw_version_id[HW_VERSION + HW_VERSION_SUB_VER] = {0};
 	char hw_version_sub_ver[HW_VERSION_SUB_VER] = {0};	
 	char *compass_gs_name = NULL;
 	char *sensors_list_name = NULL;
-    set_s_board_hw_version(s_board_id,hw_version_id);
-    sprintf(sub_ver, ".Ver%c", 'A'+(char)get_hw_sub_board_id());
-   sprintf(hw_version_sub_ver, "VER.%c", 'A'+(char)get_hw_sub_board_id());
-    strcat(s_board_id, sub_ver);
-    strcat(hw_version_id, hw_version_sub_ver);
-    set_s_board_hw_version_special(hw_version_id,hw_version_sub_ver,s_board_id,sub_ver);
+	set_s_board_hw_version(s_board_id,hw_version_id);
+	sprintf(sub_ver, ".Ver%c", 'A'+(char)get_hw_sub_board_id());
+	sprintf(hw_version_sub_ver, "VER.%c", 'A'+(char)get_hw_sub_board_id());
+	strcat(s_board_id, sub_ver);
+	strcat(hw_version_id, hw_version_sub_ver);
+	set_s_board_hw_version_special(hw_version_id,hw_version_sub_ver,s_board_id,sub_ver);
 	compass_gs_name=get_compass_gs_position_name();
 	sensors_list_name = get_sensors_list_name();
 	lcd_name = get_lcd_panel_name();
 	wifi_device_name = get_wifi_device_name();
 	bt_device_name = get_bt_device_name();
+	framebuffer_boosted = get_framebuffer_boosted();
 	get_audio_property(audio_property);
 	touch_info = get_touch_info();
 	if (touch_info == NULL)
@@ -438,12 +440,13 @@ static int app_version_read_proc(char *page, char **start, off_t off,
 	"compass_gs_position:\n%s\n"
 	"sensors_list:\n%s\n"
 	"hw_version:\n%s\n"
-    "wifi_chip:\n%s\n"
-    "bt_chip:\n%s\n"
+	"framebuffer_boosted:\n%s\n"
+	"wifi_chip:\n%s\n"
+	"bt_chip:\n%s\n"
 	"audio_property:\n%s\n"
 	"touch_info:\n%s\n"
 	"battery_id:\n%s\n",
-	appsboot_version, ker_ver, str_flash_nand_id, s_board_id, lcd_name, camera_id, ts_id,charge_flag, compass_gs_name,sensors_list_name, hw_version_id,wifi_device_name, bt_device_name, audio_property, touch_info, battery_name);
+	appsboot_version, ker_ver, str_flash_nand_id, s_board_id, lcd_name, camera_id, ts_id,charge_flag, compass_gs_name,sensors_list_name, hw_version_id, framebuffer_boosted, wifi_device_name, bt_device_name, audio_property, touch_info, battery_name);
 #else
 	len = snprintf(page, PAGE_SIZE, "APPSBOOT:\n"
 	"%s\n"
@@ -458,10 +461,11 @@ static int app_version_read_proc(char *page, char **start, off_t off,
 	"compass_gs_position:\n%s\n"
 	"sensors_list:\n%s\n"
 	"hw_version:\n%s\n"
+	"framebuffer_boosted:\n%s\n"
 	"audio_property:\n%s\n"
 	"touch_info:\n%s\n"
 	"battery_id:\n%s\n",
-	appsboot_version, ker_ver, str_flash_nand_id, s_board_id, lcd_name, camera_id, ts_id, compass_gs_name,sensors_list_name, hw_version_id,audio_property, touch_info, battery_name);
+	appsboot_version, ker_ver, str_flash_nand_id, s_board_id, lcd_name, camera_id, ts_id, compass_gs_name,sensors_list_name, hw_version_id, framebuffer_boosted, audio_property, touch_info, battery_name);
 #endif
 
 	return proc_calc_metrics(page, start, off, count, eof, len);

include/linux/hardware_self_adapt.h

@@ -395,6 +395,7 @@ int board_support_ofn(bool * ofn_support);
 char *get_compass_gs_position_name(void);
 char *get_sensors_list_name(void);
 char *get_wifi_device_name(void);
+char *get_framebuffer_boosted(void);
 hw_bt_device_model get_hw_bt_device_model(void);
 char *get_bt_device_name(void);
 lcd_panel_type get_lcd_panel_type(void);