Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LFP data block fetch 

Apparently the proper way to do this is to use the LFP data pointer block to figure out the LFP data block entry size, then use that plus the panel index to calculate an offset into the LFP data block array.

Fixes fdo bug #19450.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Jesse Barnes 2009-06-22 11:11:06 -07:00
parent 534e73ad4f
commit 15af8ea6ab
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bios_reader/bios_reader.c
View File

@ -275,18 +275,30 @@ static void dump_lvds_options(void)
static void dump_lvds_ptr_data(void)
{
struct bdb_block *block;
struct bdb_lvds_lfp_data *lvds_data;
struct bdb_lvds_lfp_data_ptrs *ptrs;
struct lvds_fp_timing *fp_timing;
struct bdb_lvds_lfp_data_entry *entry;
int lfp_data_size;
block = find_section(BDB_LVDS_LFP_DATA_PTRS);
if (!block) {
printf("No LFP data pointers block\n");
return;
}
ptrs = block->data;
fp_timing = (struct lvds_fp_timing *)((uint8_t *)bdb +
ptrs->ptr[panel_type].fp_timing_offset);
block = find_section(BDB_LVDS_LFP_DATA);
if (!block) {
printf("No LVDS data block\n");
return;
}
lvds_data = block->data;
lfp_data_size = ptrs->ptr[1].fp_timing_offset - ptrs->ptr[0].fp_timing_offset;
entry = (struct bdb_lvds_lfp_data_entry *)((uint8_t *)lvds_data->data +
(lfp_data_size * panel_type));
fp_timing = &entry->fp_timing;
printf("LVDS timing pointer data:\n");
printf(" Number of entries: %d\n", ptrs->lvds_entries);

17
src/i830_bios.c
View File

@ -118,9 +118,11 @@ parse_integrated_panel_data(I830Ptr pI830, struct bdb_header *bdb)
{
struct bdb_lvds_options *lvds_options;
struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
int timing_offset;
struct bdb_lvds_lfp_data *lvds_data;
struct bdb_lvds_lfp_data_entry *entry;
DisplayModePtr fixed_mode;
unsigned char *timing_ptr;
int lfp_data_size;
/* Defaults if we can't find VBT info */
pI830->lvds_dither = 0;
@ -133,13 +135,20 @@ parse_integrated_panel_data(I830Ptr pI830, struct bdb_header *bdb)
if (lvds_options->panel_type == 0xff)
return;
lvds_data = find_section(bdb, BDB_LVDS_LFP_DATA);
if (!lvds_data) {
return;
}
lvds_lfp_data_ptrs = find_section(bdb, BDB_LVDS_LFP_DATA_PTRS);
if (!lvds_lfp_data_ptrs)
return;
timing_offset =
lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset;
timing_ptr = (unsigned char *)bdb + timing_offset;
lfp_data_size = lvds_lfp_data_ptrs->ptr[1].fp_timing_offset -
lvds_lfp_data_ptrs->ptr[0].fp_timing_offset;
entry = (struct bdb_lvds_lfp_data_entry *)((uint8_t *)lvds_data->data +
(lfp_data_size * lvds_options->panel_type));
timing_ptr = (unsigned char *)&entry->fp_timing;
if (pI830->skip_panel_detect)
return;