Merge "target: msm8952: Disable QPNP WLED and LABIBB for HX8394F 720p panel"
diff --git a/platform/msm_shared/partition_parser.c b/platform/msm_shared/partition_parser.c
old mode 100644
new mode 100755
index 3752ba8..85db733
--- a/platform/msm_shared/partition_parser.c
+++ b/platform/msm_shared/partition_parser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -83,6 +83,8 @@
struct partition_entry *partition_entries;
static unsigned gpt_partitions_exist = 0;
static unsigned partition_count;
+/* this is a pointer to ptn_entries_buffer */
+static unsigned char *new_buffer = NULL;
unsigned partition_get_partition_count()
{
@@ -273,9 +275,9 @@
unsigned int n = 0; /* Counter for UTF-16 -> 8 conversion */
unsigned char UTF16_name[MAX_GPT_NAME_SIZE];
/* LBA of first partition -- 1 Block after Protected MBR + 1 for PT */
- unsigned long long partition_0;
uint64_t device_density;
uint8_t *data = NULL;
+ uint8_t *data_org_ptr = NULL;
uint32_t part_entry_cnt = block_size / ENTRY_SIZE;
/* Get the density of the mmc device */
@@ -289,6 +291,7 @@
ret = -1;
goto end;
}
+ data_org_ptr = data;
/* Print out the GPT first */
ret = mmc_read(block_size, (unsigned int *)data, block_size);
@@ -330,19 +333,11 @@
}
parse_secondary_gpt = 0;
}
- partition_0 = GET_LLWORD_FROM_BYTE(&data[PARTITION_ENTRIES_OFFSET]);
/* Read GPT Entries */
for (i = 0; i < (ROUNDUP(max_partition_count, part_entry_cnt)) / part_entry_cnt; i++) {
ASSERT(partition_count < NUM_PARTITIONS);
- ret = mmc_read((partition_0 * block_size) + (i * block_size),
- (uint32_t *) data, block_size);
-
- if (ret) {
- dprintf(CRITICAL,
- "GPT: mmc read card failed reading partition entries.\n");
- goto end;
- }
-
+
+ data = (new_buffer + (i * block_size));
for (j = 0; j < part_entry_cnt; j++) {
memcpy(&(partition_entries[partition_count].type_guid),
&data[(j * partition_entry_size)],
@@ -394,8 +389,10 @@
}
}
end:
- if (data)
- free(data);
+ if (data_org_ptr)
+ free(data_org_ptr);
+ if (new_buffer)
+ free(new_buffer);
return ret;
}
@@ -589,6 +586,8 @@
unsigned int partition_entry_array_start;
unsigned char *primary_gpt_header;
unsigned char *secondary_gpt_header;
+ //define as 64 bit unsigned int
+ unsigned long long *last_partition_entry;
unsigned int offset;
unsigned long long card_size_sec;
int total_part = 0;
@@ -624,9 +623,14 @@
(ptn_entries_blocks + GPT_HEADER_BLOCKS))));
/* Find last partition */
- while (*(primary_gpt_header + block_size + total_part * ENTRY_SIZE) !=
- 0) {
+ last_partition_entry = (unsigned long long *)
+ (primary_gpt_header + block_size + total_part * ENTRY_SIZE);
+ //need check 128 bit for GUID
+ while (*last_partition_entry != 0 ||
+ *(last_partition_entry + 1) != 0 ) {
total_part++;
+ last_partition_entry = (unsigned long long *)
+ (primary_gpt_header + block_size + total_part * ENTRY_SIZE);
}
/* Patching last partition */
@@ -1163,11 +1167,12 @@
uint32_t ret = 0;
uint32_t partitions_for_block = 0;
uint32_t blocks_to_read = 0;
- unsigned char *new_buffer = NULL;
unsigned long long last_usable_lba = 0;
unsigned long long partition_0 = 0;
unsigned long long current_lba = 0;
uint32_t block_size = mmc_get_device_blocksize();
+ uint32_t blocks_for_entries =
+ (NUM_PARTITIONS * PARTITION_ENTRY_SIZE)/ block_size;
/* Get the density of the mmc device */
uint64_t device_density = mmc_get_device_capacity();
@@ -1215,10 +1220,19 @@
/*current lba and GPT lba should be same*/
if (!parse_secondary_gpt) {
if (current_lba != GPT_LBA) {
- dprintf(CRITICAL,"GPT first usable LBA mismatch\n");
+ dprintf(CRITICAL,"Primary GPT first usable LBA mismatch\n");
return 1;
}
}
+ else
+ {
+ if (current_lba != ((device_density/block_size) - 1))
+ {
+ dprintf(CRITICAL,"Secondary GPT first usable LBA mismatch\n");
+ return 1;
+ }
+ }
+
/*check for first lba should be with in the valid range*/
if (*first_usable_lba > (device_density/block_size)) {
dprintf(CRITICAL,"Invalid first_usable_lba\n");
@@ -1258,11 +1272,24 @@
if (!flashing_gpt) {
partition_0 = GET_LLWORD_FROM_BYTE(&buffer[PARTITION_ENTRIES_OFFSET]);
/*start LBA should always be 2 in primary GPT*/
- if(partition_0 != 0x2 && !parse_secondary_gpt) {
- dprintf(CRITICAL, "Starting LBA mismatch\n");
- ret = 1;
- goto fail;
-
+ if (!parse_secondary_gpt)
+ {
+ if (partition_0 != 0x2)
+ {
+ dprintf(CRITICAL, "PrimaryGPT starting LBA mismatch\n");
+ ret = 1;
+ goto fail;
+ }
+ }
+ else
+ {
+ if (partition_0 != ((device_density/block_size) -
+ (blocks_for_entries + GPT_HEADER_BLOCKS)))
+ {
+ dprintf(CRITICAL, "BackupGPT starting LBA mismatch\n");
+ ret = 1;
+ goto fail;
+ }
}
/*read the partition entries to new_buffer*/
ret = mmc_read((partition_0) * (block_size), (unsigned int *)new_buffer, (blocks_to_read * block_size));
@@ -1278,6 +1305,7 @@
dprintf(CRITICAL,"Partition entires crc mismatch crc_val= %u with crc_val_org= %u\n",crc_val,crc_val_org);
ret = 1;
}
+ return ret;
}
fail:
free(new_buffer);
diff --git a/target/msm8953/oem_panel.c b/target/msm8953/oem_panel.c
index 8bb0c47..e20f8d9 100644
--- a/target/msm8953/oem_panel.c
+++ b/target/msm8953/oem_panel.c
@@ -254,6 +254,12 @@
case HX8399C_FHD_PLUSE_VIDEO_PANEL:
panelstruct->paneldata = &hx8399c_fhd_pluse_video_panel_data;
panelstruct->panelres = &hx8399c_fhd_pluse_video_panel_res;
+ panelstruct->panelres->hfront_porch = 52;
+ panelstruct->panelres->hback_porch = 48;
+ panelstruct->panelres->hpulse_width = 8;
+ panelstruct->panelres->vfront_porch = 8;
+ panelstruct->panelres->vback_porch = 8;
+ panelstruct->panelres->vpulse_width = 4;
panelstruct->color = &hx8399c_fhd_pluse_video_color;
panelstruct->videopanel =
&hx8399c_fhd_pluse_video_video_panel;