summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2008-12-04 11:41:02 -0800
committerCarl Worth <cworth@cworth.org>2008-12-08 12:50:39 -0800
commitce7efc2e3676c8f80206415480dda91e5e021396 (patch)
treeab819790be972a13bd36f1979646719a5920be5f
parente8b95efbf5d9c3a5b75b2bb8b5b51844b5fcdfbc (diff)
Don't smash fixed_mode if skip_panel_detect is set.
Without this change, setting LVDSFixedMode to false is not effective as i830_bios_init calls i830_parse_panel_data which in turns sets a fixed_mode. To fix this we still call parse_panel_data to set the various lvds_options but we return before setting fixed_mode.
-rw-r--r--src/i830_bios.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/i830_bios.c b/src/i830_bios.c
index 007530dc..72408f0f 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -109,6 +109,9 @@ parse_panel_data(I830Ptr pI830, struct bdb_header *bdb)
lvds_lfp_data_ptrs->ptr[lvds_options->panel_type].dvo_timing_offset;
timing_ptr = (unsigned char *)bdb + timing_offset;
+ if (pI830->skip_panel_detect)
+ return;
+
fixed_mode = xnfalloc(sizeof(DisplayModeRec));
memset(fixed_mode, 0, sizeof(*fixed_mode));