hal-info: Branch 'master' - 6 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Mar 18 12:13:28 PDT 2008
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 6 +++
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 6 +--
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 9 +----
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 7 +++-
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 19 ++++++++----
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 10 ++++++
fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi | 2 -
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 2 -
8 files changed, 43 insertions(+), 18 deletions(-)
New commits:
commit b655ab276446ead2a05ec31b0198ff99b6f8b9a2
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 20:13:21 2008 +0100
updated Sony/Samsung/misc quirks with entries from s2ram CVS -r1.119
Updated quirks with entries from s2ram whitelist CVS -r1.119:
- Sony: VGN-TZ91HS, PCG-Z505HSK(UC)
- Samsung: SX22S
- misc: ZEPTO ZNOTE 3215W
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index b55aa0b..641fbe7 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -378,4 +378,14 @@
</match>
</device>
+ <device>
+ <match key="system.hardware.vendor" string="ZEPTO">
+ <match key="system.hardware.product" prefix="ZNOTE">
+ <match key="system.hardware.version" prefix="3215W">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+ </device>
+
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 5b6c5a2..bf835d9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -7,7 +7,7 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
- <match key="system.hardware.product" string_outof="R40/R41;CoronaR">
+ <match key="system.hardware.product" string_outof="R40/R41;CoronaR;SX22S">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string_outof="SX20S;SENS V25;NX05S">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 6c89218..4bbfad4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -38,7 +38,7 @@
<!-- Note:
- VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
- VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
- <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M">
+ <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK(UC)">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains_outof="VGN-TZ11;PCG-F430(UC);PCG-GRT916Z;PCG-GRT995MP;PCG-GR7_K(J) ">
commit b12a05c4fcb0394fc1d322830bd644d8447839bb
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 20:07:58 2008 +0100
updated Lenovo quirks with entries from s2ram CVS -r1.119
Updated Lenovo quirks with entries from s2ram whitelist CVS -r1.119:
- added ThinkPads: 8918, 8943,
- added a 3000 N100 and a 3000 N200
- fixed ThinPad: 7666
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 5eda064..60b9498 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -5,12 +5,12 @@
<!-- ThinkPads -->
<!-- X60 / X60s / T61 / R61 / X61 Tablet -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;6365;7658;7661;7733;7738;7767;7768;8919;9452">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;6365;7658;7661;7666;7733;7738;7767;7768;8919;9452">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <!-- X61* Tablet, R61i (7732,8932), X60s (7666) -->
- <match key="system.hardware.product" prefix_outof="7669;7764;7666;7673;7674;7675;7732;8932">
+ <!-- X61* Tablet, R61i (7732,8932) -->
+ <match key="system.hardware.product" prefix_outof="7669;7764;7673;7674;7675;7732;8932">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix="63664DU">
@@ -47,13 +47,13 @@
</match>
<!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
T61p (6460), does not work with the NVidia driver-->
- <match key="system.hardware.product" prefix_outof="8895;8897;6457;6460;6464;6465">
+ <match key="system.hardware.product" prefix_outof="6457;6460;6464;6465;8895;8897;8943">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- These Thinpads don't need a quirk: 6459 (T61p), 7664 (T60) see s2ram -->
- <match key="system.hardware.product" prefix_outof="6459;7664">
+ <match key="system.hardware.product" prefix_outof="6459;7664;8918">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
@@ -65,6 +65,15 @@
<match key="system.hardware.product" prefix="07687MM">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string="076804U">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ </match>
+ <match key="system.hardware.version" prefix_ncase="3000 N200">
+ <match key="system.hardware.product" string="0769B9G">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
<match key="system.hardware.version" string_ncase="LENOVO3000 V100">
<match key="system.hardware.product" prefix="0763">
commit f86cb4dc904781639e07845e467683c634bd4352
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 19:56:51 2008 +0100
updated Fujitsu quirks with entries from s2ram CVS -r1.119
Updated Fujitsu quirks with entries from s2ram whitelist CVS -r1.119:
- added AMILO M which need a new key for PCI_SAVE (match commented out)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 0fac00f..f2e21aa 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -18,10 +18,15 @@
<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_outof="M ;A Series">
+ <match key="system.hardware.product" contains_outof="AMILO M;A Series">
<match key="system.hardware.version" contains_outof="-1 ;0.01">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ <!-- This machine need a special new quirk: power_management.quirk.pci_save
+ <match key="system.firmware.version" prefix="R01-S0N">
+ <merge key="power_management.quirk.pci_save" type="bool">true</merge>
+ </match>
+ -->
</match>
</match>
<match key="system.hardware.product" contains="A7645">
commit 108cfc3db536c7a084f975a91a9c3df2cfe6d9f9
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 19:52:24 2008 +0100
updated Dell quirks with entries from s2ram CVS -r1.119
Updated Dell quirks with entries from s2ram whitelist CVS -r1.119:
- Latitude: C840
- Inspiron: 1100, 1520
- fixed Inspiron 500m
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index dd6ed23..c37f55e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -23,7 +23,7 @@
<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_outof="C400;D500;D505;D800;X200">
+ <match key="system.hardware.product" contains_outof="C400;C840;D500;D505;D800;X200">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -43,9 +43,6 @@
<!-- Dell Inspiron -->
<match key="system.hardware.product" prefix="Inspiron">
- <match key="system.hardware.product" contains=" 500m">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- </match>
<match key="system.hardware.product" contains="1501">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
@@ -62,7 +59,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" contains="600m">
+ <match key="system.hardware.product" contains="500m;600m;1100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -76,7 +73,7 @@
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
<!-- these need no quirks -->
- <match key="system.hardware.product" contains_outof=" 1150; 1720">
+ <match key="system.hardware.product" contains_outof=" 1150; 1520; 1720">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit 9570d880ce88e36047ced88c90a032390739ce47
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 19:35:22 2008 +0100
updated Asus quirks with entries from s2ram CVS -r1.119
Updated Asus quirks with entries from s2ram whitelist CVS -r1.119:
- added: F3JP, A6Kt
- fixed: A2H/L, A6Km (removed whitespaces)
- added comment for Eee PC (s2ram use vbe_post+vbemode_restore)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 94f972d..91b5300 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -24,17 +24,17 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- Z91E is identified as A3E -->
- <match key="system.hardware.product" prefix_outof="A6U;A3E">
+ <match key="system.hardware.product" prefix_outof="A6U;A3E;F3JP">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
- <!-- Asus Eee PC -->
+ <!-- Asus Eee PC (Note: there is a report from s2ram to use vbe_post, vbemode_restore)-->
<match key="system.hardware.product" string="701">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
</match>
<!-- these need no quirks, whitelist them -->
- <match key="system.hardware.product" prefix_outof="A2H/L ;A6Km ;A6T;A6G;A6VA;F3T">
+ <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6Kt;A6T;A6G;A6VA;F3T">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit 3d6e313d21e56d2a8ea15f588d32a48c9d7dd01f
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 19:29:24 2008 +0100
updated Acer quirks with entries from s2ram CVS -r1.119
Updated misc quirks with entries from s2ram whitelist CVS -r1.119:
- Travelmate: 2490, 4000
- Ferrari: 4000
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 08a05a1..5ca0bbf 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -6,7 +6,7 @@
<match key="system.hardware.product" contains="C300">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="2350;2410;2420;3220;4650">
+ <match key="system.hardware.product" contains_outof="2350;2410;2420;2490;3220;4000;4650">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -110,6 +110,10 @@
<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="1000">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
<!-- does not work with fglrx -->
<match key="system.hardware.product" contains="5000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
More information about the hal-commit
mailing list