hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Aug 29 07:36:56 PDT 2007
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 23 -----
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 25 ++----
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 50 +++---------
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 23 -----
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 44 +++-------
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 12 --
6 files changed, 44 insertions(+), 133 deletions(-)
New commits:
diff-tree 649f637536a05756f1b0e90290084baaa36c7365 (from 499abe797744534e2340b20b3c791b00f3d0f637)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 29 16:35:11 2007 +0200
consolidate 20-video-quirk-pm-* fdi-files
Used new *_outof fdi match directive to reduce the number of matches
and the size of the files.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 4286c90..7a9fb69 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -9,29 +9,10 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix="M6Ne">
+ <match key="system.hardware.product" prefix_outof="M6Ne;V6V">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix="M6VA">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" string="V6V">
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="M6N ">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="M5N">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="M7A">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="S6F">
+ <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 1c0aa4b..0ef0aa3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -2,12 +2,15 @@
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="Dell">
+ <!-- Dell Precision -->
<match key="system.hardware.product" prefix="Precision">
<match key="system.hardware.product" contains="M65">
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
</match>
+
+ <!-- Dell Latitude -->
<match key="system.hardware.product" prefix="Latitude">
<match key="system.hardware.product" contains="C600">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
@@ -28,21 +31,12 @@
DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> -->
</match>
- <match key="system.hardware.product" contains="D600">
+ <match key="system.hardware.product" contains_outof="D600;D610">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="D610">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="D620">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="D800">
+ <match key="system.hardware.product" contains_outof="D620;D800">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -61,8 +55,10 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
+
+ <!-- Dell Inspiron -->
<match key="system.hardware.product" prefix="Inspiron">
- <match key="system.hardware.product" contains="5150">
+ <match key="system.hardware.product" contains_outof="5150;8000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -75,16 +71,13 @@
<merge key="power_management.quirk.vga_mode3" type="bool">true</merge> -->
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="8000">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
<match key="system.hardware.product" contains="MM061">
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
+
<!-- Dell XPS M1210 -->
<match key="system.hardware.product" prefix="MXC062">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index c790588..52884ef 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -10,16 +10,26 @@
</device>
<device>
<match key="system.hardware.vendor" prefix="Hewlett-Packard">
+
+ <match key="system.hardware.product" contains_outof="ze2000;R4100">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" contains_outof="nx6125;nc6230;nx8220">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" contains_outof="nx7000;nx7300;nc6120;nc6320">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
+
<match key="system.hardware.product" contains="nx5000">
<match key="system.firmware.version" prefix="68BCU">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains="ze2000">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
<match key="system.hardware.product" contains="nc6000">
<match key="system.firmware.version" prefix="68BDD">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -38,41 +48,9 @@
<match key="system.hardware.product" prefix="Pavilion zt3300">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="nx6125">
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nc6230">
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nx7000">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nx8220">
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
<match key="system.hardware.product" contains="nc4200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="R4100">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nx7300">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nc6120">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nc6320">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- </match>
</match>
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 4f0710d..c353a64 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -7,11 +7,6 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <!-- T30 -->
- <match key="system.hardware.product" prefix="1860">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
<!-- X31 -->
<match key="system.hardware.product" prefix="2366">
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
@@ -34,12 +29,8 @@
<match key="system.hardware.product" prefix="2525">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <!-- T41p -->
- <match key="system.hardware.product" prefix="2373">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="2374">
+ <!-- T30, T41p, T41p, Z60t, Z60m -->
+ <match key="system.hardware.product" prefix_outof="1860;2373;2374;2513;2529">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -66,16 +57,6 @@
<match key="system.hardware.product" prefix="2388">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <!-- Z60m -->
- <match key="system.hardware.product" prefix="2529">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <!-- Z60t -->
- <match key="system.hardware.product" prefix="2513">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
</match>
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index f33dc74..b7c0520 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -3,46 +3,32 @@
<device>
<match key="system.hardware.vendor" string="LENOVO">
<!-- X60 / X60s -->
- <match key="system.hardware.product" prefix="1702">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="1704">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="1709">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="63664DU">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <!-- T60p -->
- <match key="system.hardware.product" prefix="1706">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
+
+ <!-- R60 -->
<match key="system.hardware.version" prefix_ncase="ThinkPad R60">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.version" string="ThinkPad T60">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.version" string="ThinkPad T60p">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.version" string="ThinkPad Z61m">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
- </match>
- <match key="system.hardware.version" string="ThinkPad Z61t">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+
+ <!-- T60*, Z61* -->
+ <match key="system.hardware.version" prefix="ThinkPad ">
+ <match key="system.hardware.version" suffix="T60">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.version" contains_outof="T60p;Z61m;Z61t">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
+
<!-- T61 -->
<match key="system.hardware.version" string="766314G">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index eefd3c5..9dbdb82 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -17,15 +17,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix="P2000">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="P4000">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="PORTEGE A100">
+ <match key="system.hardware.product" prefix_outof="P2000;P4000;PORTEGE A100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -41,4 +33,4 @@
</match>
</match>
</device>
-</deviceinfo>
\ No newline at end of file
+</deviceinfo>
More information about the hal-commit
mailing list