From ce7efc2e3676c8f80206415480dda91e5e021396 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Thu, 4 Dec 2008 11:41:02 -0800
Subject: [PATCH] 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.
---
 src/i830_bios.c | 3 +++
 1 file changed, 3 insertions(+)

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));