xf86-video-intel: 2 commits - src/bios_reader/bios_reader.c src/i830_bios.c src/i830_bios.h

[Zhenyu Wang]

 src/bios_reader/bios_reader.c |    4 ++++
 src/i830_bios.c               |    6 +++++-
 src/i830_bios.h               |    6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 2d0aa553609a0e64fa4b2e755b9b1e244e5c3fa1
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Mar 2 15:26:44 2009 +0800

    Skip LVDS config parsing on pre-9xx chips.
    
    855GM laptops seems pretty broken when parsing this block.

diff --git a/src/i830_bios.c b/src/i830_bios.c
index a990ebe..7f20553 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -174,9 +174,13 @@ parse_driver_feature(I830Ptr pI830, struct bdb_header *bdb)
     struct bdb_driver_feature *feature;
 
     /* For mobile chip, set default as true */
-    if (IS_MOBILE(pI830))
+    if (IS_MOBILE(pI830) && !IS_I830(pI830))
 	pI830->integrated_lvds = TRUE;
 
+    /* skip pre-9xx chips which is broken to parse this block. */
+    if (!IS_I9XX(pI830))
+	return;
+
     feature = find_section(bdb, BDB_DRIVER_FEATURES);
     if (!feature)
 	return;
commit 55359ef9ab0a2be42a55e0279835f76a191d6c74
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Feb 27 09:02:30 2009 +0800

    Update driver feature block definition for missed fields

diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
index 41908a3..fc51821 100644
--- a/src/bios_reader/bios_reader.c
+++ b/src/bios_reader/bios_reader.c
@@ -416,6 +416,10 @@ static void dump_driver_feature(void)
 	    printf("Embedded DisplayPort\n");
 	    break;
     }
+    printf("\tDefine Display statically: %s\n", YESNO(feature->static_display));
+    printf("\tLegacy CRT max X: %d\n", feature->legacy_crt_max_x);
+    printf("\tLegacy CRT max Y: %d\n", feature->legacy_crt_max_y);
+    printf("\tLegacy CRT max refresh: %d\n", feature->legacy_crt_max_refresh);
     free(block);
 }
 
diff --git a/src/i830_bios.h b/src/i830_bios.h
index ec8bd8f..78af830 100644
--- a/src/i830_bios.h
+++ b/src/i830_bios.h
@@ -428,6 +428,12 @@ struct bdb_driver_feature {
     uint16_t	crt_hotplug:1;
     uint16_t	lvds_config:2;
     uint16_t	reserved:3;
+
+    uint8_t	static_display:1;
+    uint8_t	reserved2:7;
+    uint16_t	legacy_crt_max_x;
+    uint16_t	legacy_crt_max_y;
+    uint8_t	legacy_crt_max_refresh;
 } __attribute__((packed));
 
 #ifndef REG_DUMPER