hal-info: Branch 'master' - 12 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Oct 6 02:55:51 PDT 2008
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 7 ++
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 14 ++++-
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 15 ++++-
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 31 +++++++++---
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 21 ++++++--
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 8 +--
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 6 +-
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 26 +++++++---
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 8 +--
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 18 +++++-
10 files changed, 116 insertions(+), 38 deletions(-)
New commits:
commit 27f4e62c30f028c409a526a6aef193d09300937c
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:54:03 2008 +0200
updated misc suspend quirks with s2ram whitelist entries from -r1.133
Updated misc suspend quirks with s2ram whitelist entries from -r1.133.
New:
- AnabelleB Claro TW7M
- MSI: EX610, MS-6702
- VIA: K8N800 (Clevo D410J, VT8204B)
Fixed:
- MSI: Wind U-100 (s3_bios/s3_mode to suspend more than one time)
- NOTEBOOK SAM2000
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index be1183d..00710d5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -8,6 +8,15 @@
</match>
</device>
<device>
+ <match key="system.hardware.vendor" string="AnabelleB">
+ <!-- ASI Claro TW7M Notebook -->
+ <match key="system.hardware.version" string="Claro TW7M">
+ <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>
+ <device>
<match key="system.hardware.vendor" prefix="COMPAL">
<match key="system.hardware.product" contains_outof="HEL80C;HEL80I;HEL81I">
<merge key="power_management.quirk.none" type="bool">true</merge>
@@ -76,6 +85,12 @@
<match key="system.hardware.product" string="VT8623-8235">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string="K8N800">
+ <match key="system.firmware.version" string="VT8204B ">
+ <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" string="K8T400">
<match key="system.hardware.version" string="VT8204B ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -159,7 +174,7 @@
<match key="system.hardware.product" string_outof="MS-1012;MS-1013">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" string="MS-1057">
+ <match key="system.hardware.product" string_outof="MS-1057;U-100">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -168,9 +183,9 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" string="U-100">
+ <match key="system.hardware.product" string="EX610">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="MS-1412">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -179,7 +194,7 @@
</match>
</match>
<match key="system.hardware.vendor" prefix="MSI">
- <match key="system.hardware.product" string_outof="MS-7350;MS-7207PV;MS-6417">
+ <match key="system.hardware.product" string_outof="MS-7350;MS-7207PV;MS-6417;MS-6702">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -348,8 +363,7 @@
<match key="system.hardware.vendor" string="NOTEBOOK">
<match key="system.hardware.product" string="SAM2000">
<match key="system.hardware.version" string="0131">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ <merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
<!-- medion MIM2080 -->
commit b7b835970e4df2bc7d3c1d675b355ea5d05d6d78
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:47:24 2008 +0200
updated Sony suspend quirks with s2ram whitelist entries from -r1.133
Updated Sony suspend quirks with s2ram whitelist entries from -r1.133.
New:
- VGN-C2S_H, VGN-FE890E, VGN-FS920, VGN-FW11S, VGN-N320E
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 559bc57..b4a8e22 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -5,10 +5,10 @@
<match key="system.hardware.product" string="VGN-FS115Z">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B">
+ <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-C2S_H">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N">
+ <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -34,7 +34,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P">
+ <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P;VGN-FW11S">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -47,7 +47,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;VGN-TZ91HS;PCG-Z505HSK(UC);VGN-FZ39VN;VGN-A115B">
+ <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);VGN-FZ39VN;VGN-A115B;VGN-FE890E;VGN-N320E">
<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 a870b96dc061e7dec1353efebfadd6657a25b405
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:44:49 2008 +0200
updated Toshiba suspend quirks with s2ram whitelist entries from -r1.133
Updated Toshiba suspend quirks with s2ram whitelist entries from -r1.133.
New:
- Satellite: 1130, A205, A300D, U300
- Tecra: M4, S2
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 3a36d81..59d296a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -4,10 +4,10 @@
<match key="system.hardware.vendor" string="TOSHIBA">
<!-- Satellite Laptops -->
<match key="system.hardware.product" prefix="Satellite">
- <match key="system.hardware.product" contains=" M30X">
+ <match key="system.hardware.product" contains_outof=" M30X; 1130">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="Pro A120;M35X;P100;P200; P205D; A100; A105; A135; A200; A210; L30; M105;M70">
+ <match key="system.hardware.product" contains_outof="Pro A120;M35X;P100;P200; P205D; A100; A105; A135; A200; A205; A210; L30; M105;M70">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -32,6 +32,10 @@
<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="A300D">
+ <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="A30">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -39,7 +43,7 @@
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
</match>
<!-- these need no quirks-->
- <match key="system.hardware.product" contains_outof="A80;Pro4600; U200;Pro U300">
+ <match key="system.hardware.product" contains_outof="A80;Pro4600; U200;Pro U300; U300">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -52,6 +56,14 @@
<match key="system.hardware.product" string="T9000">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains=" M4">
+ <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=" S2">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
<!-- these need no quirks-->
<match key="system.hardware.product" contains_outof=" A8; A9; S3; S1">
<merge key="power_management.quirk.none" type="bool">true</merge>
commit 842b0b86fac7cfa52db7e81f37efe85d88e6d9b7
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:39:56 2008 +0200
updated Lenovo suspend quirks with s2ram whitelist entries from -r1.133
Updated Lenovo suspend quirks with s2ram whitelist entries from -r1.133.
New:
- 2007, 3000 N200 (0769BEG)
Fixed:
- 3000 N200 (0769AC6)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 913298e..036b562 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -6,7 +6,7 @@
<!-- X60 / X60s / T61 / T61p / R61 / R61s / X61(s/Tablet) / X300 -->
<!-- NOTE: there is a report that 6458 needs vbe_post/vbemode_restore -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;2478;2479;4108;4141;4143;6088;6363;6364;6365;6378;6379;6480;6458;6463;6464;6465;6466;6467;6468;6471;6476;6477;6478;7642;7643;7644;7645;7646;7647;7648;7649;7650;7657;7658;7659;7660;7661;7666;7667;7668;7732;7733;7734;7735;7736;7737;7738;7762;7763;7764;7767;7768;7669;7670;7671;7673;7674;7675;7676;7678;7679;8895;8896;8897;8898;8899;8900;8919;8930;8932;8933;8934;8935;8936;8937;8938;8939;8942;8943;8944;8945;8946;8947;8948;9452">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;2007;2478;2479;4108;4141;4143;6088;6363;6364;6365;6378;6379;6480;6458;6463;6464;6465;6466;6467;6468;6471;6476;6477;6478;7642;7643;7644;7645;7646;7647;7648;7649;7650;7657;7658;7659;7660;7661;7666;7667;7668;7732;7733;7734;7735;7736;7737;7738;7762;7763;7764;7767;7768;7669;7670;7671;7673;7674;7675;7676;7678;7679;8808;8895;8896;8897;8898;8899;8900;8919;8930;8932;8933;8934;8935;8936;8937;8938;8939;8942;8943;8944;8945;8946;8947;8948;9452">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -73,11 +73,11 @@
</match>
</match>
<match key="system.hardware.version" prefix_ncase="3000 N200">
- <match key="system.hardware.product" string="0769BBG">
+ <match key="system.hardware.product" string="0769BBG;0769AC6">
<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_outof="0769B9G;0769AC6">
+ <match key="system.hardware.product" string_outof="0769B9G;0769BEG">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit a6c3913bd7b391811689b433c86dac2bb29885cd
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:37:34 2008 +0200
updated IBM suspend quirks with s2ram whitelist entries from -r1.133
Updated IBM suspend quirks with s2ram whitelist entries from -r1.133.
New:
- G41
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index a5a4f05..9ebb828 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -66,10 +66,10 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <!-- R52 ATI Mobility Radeon X300 -->
- <match key="system.hardware.product" prefix="1846">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <!-- R52 ATI Mobility Radeon X300, G41 -->
+ <match key="system.hardware.product" prefix_outof="1846;2886">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- T41 -->
<match key="system.hardware.version" string="ThinkPad T41">
commit aeee209eeb684414fe4a3c5462070cda28544df5
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:34:45 2008 +0200
updated HP suspend quirks with s2ram whitelist entries from -r1.133
Updated HP suspend quirks with s2ram whitelist entries from -r1.133.
New:
- 2x HP Compaq 2133
- Compaq nw9440
- another Compaq 6910p
- another dv4000 (PX306UA)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 1f0be5d..87ab884 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -126,10 +126,16 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT">
+ <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT; nw9440">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains_outof="HP Compaq 2133;HP 2133">
+ <match key="system.firmware.version" contains="68VGU">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
<!-- Handle machines which have the same product string, but differ -->
<match key="system.hardware.product" contains="6510b">
@@ -169,7 +175,13 @@
</match>
<match key="system.hardware.product" contains="6910p">
<match key="system.firmware.version" contains="68MCD">
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <match key="system.hardware.product" contains="GB951EA">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" string="HP Compaq 6910p">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
<match key="system.firmware.version" contains_not="68MCD">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -196,7 +208,6 @@
</match>
</match>
-
<match key="system.hardware.product" contains_ncase="Pavilion ">
<match key="system.hardware.product" contains="dv4000 (ES973EA#">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -206,6 +217,10 @@
<match key="system.hardware.product" contains_outof="dv4000 (EB911EA#; dv2600; dv6500">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="dv4000 (PX306UA#">
+ <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="zd8000 (EL030EA#">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
commit 0cc5faad82d60fe2dc1a5b7ab18d5bcb0ce07627
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:23:27 2008 +0200
fixed/activated some PCI_SAVE quirks
Fixed/activated some machines with PCI_SAVE quirk:
- FSC Lifebook T4210, Lifebook P7230
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 8cef568..a3afd03 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -71,11 +71,9 @@
</match>
</match>
<match key="system.hardware.product" contains_outof="T4210;P7230">
- <!-- this need a key we currently not have in HAL:
- <merge key="power_management.quirk.pci_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.pci_save" type="bool">true</merge>
<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="B Series;T Series;S7010;S7110;E8110">
<merge key="power_management.quirk.none" type="bool">true</merge>
commit 8c3da458556d70b0f22dc1b5feace273bf40c7ee
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 11:21:37 2008 +0200
updated FSC suspend quirks with s2ram whitelist entries from -r1.133
Updated FSC suspend quirks with s2ram whitelist entries from -r1.133.
New:
- Lifebook E8110, another different T2010
- Amilo A1650G
New with other Vendor string:
- FUJITSO FMVLT70R
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index fd6cc27..8cef568 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -11,6 +11,9 @@
<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="A1650G">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" string="M Series">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -57,9 +60,15 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="T2010">
- <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.pci_save" type="bool">true</merge>
+ <match key="system.hardware.product" string="FUJITSU SIEMENS">
+ <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.pci_save" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" string="FUJITSU">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
<match key="system.hardware.product" contains_outof="T4210;P7230">
<!-- this need a key we currently not have in HAL:
@@ -68,7 +77,7 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
-->
</match>
- <match key="system.hardware.product" contains_outof="B Series;T Series;S7010;S7110">
+ <match key="system.hardware.product" contains_outof="B Series;T Series;S7010;S7110;E8110">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -98,5 +107,15 @@
</match>
</match>
+
+ <!-- different vendor string -->
+ <match key="system.hardware.vendor" prefix="FUJITSO">
+ <match key="system.hardware.product" string="FMVLT70R">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ <merge key="power_management.quirk.pci_save" type="bool">true</merge>
+ </match>
+ </match>
+
</device>
</deviceinfo>
commit 6d5a86b5fb1c4c7900930ffb902e56b4e837f683
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 10:56:20 2008 +0200
updated Asus suspend quirks with s2ram whitelist entries from -r1.133
Updated Asus suspend quirks with s2ram whitelist entries from -r1.133.
New:
- Dimension E520 (DM061)
- 2x OptiPlex FX160
- Vostro 1710
Fixed:
- OptiPlex GX260
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 79f4d6a..4be94be 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -124,6 +124,9 @@
<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="1710">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
<!-- Dell Inspiron 640m, XPS M1210 -->
@@ -132,7 +135,7 @@
</match>
<!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel)
MM061 = Inspiron E1505 or/and 6400 -->
- <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520;MM061">
+ <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520;MM061;OptiPlex GX260">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -140,10 +143,14 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains_ncase="optiplex fx160">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
- <!-- these need no quirks : DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) -->
- <match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX260;OptiPlex GX620">
- <merge key="power_management.quirk.none" type="bool">true</merge>
+ <!-- these need no quirks : Dimension E520, DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) -->
+ <match key="system.hardware.product" contains_outof="DM061 ;DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX620">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit f44694bc7e9e26214a9fc455176f85da2b2bd7a0
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 10:47:25 2008 +0200
fixed typo in suspend quirk
Fixed typo (s/s2/s3/) in suspend quirk.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 23e6eb2..2ab2f38 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -79,7 +79,7 @@
<match key="system.firmware.version" prefix="ASUS M2A-VM ACPI BIOS Revision">
<match key="system.firmware.version" contains=" 1101">
- <merge key="power_management.quirk.s2_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<match key="system.firmware.version" contains_not=" 1101">
commit 3987f03c09eb4b92196040b029e06fa9ee12f581
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 10:46:16 2008 +0200
updated Asus suspend quirks with s2ram whitelist entries from -r1.133
Updated Asus suspend quirks with s2ram whitelist entries from -r1.133.
New:
- A8JS, F2J
- ASUS Mainboard: System manufacturer/P5Q DELUXE/System Version
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index b79806e..23e6eb2 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -2,7 +2,7 @@
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="ASUS">
- <match key="system.hardware.product" prefix_outof="U5F ;M2000E">
+ <match key="system.hardware.product" prefix_outof="U5F ;M2000E;F2J ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;M51Sr ;U6S">
@@ -38,7 +38,7 @@
<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;A6JC ;A6K ;A6T;A6G;A6VA;F3Sg;F3T;F9E ;G1S;K8V-MX">
+ <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6JC ;A6K ;A6T;A6G;A6VA;A8JS ;F3Sg;F3T;F9E ;G1S;K8V-MX">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -52,6 +52,12 @@
</match>
<!-- ASUS Mainboard with different vendor string -->
<match key="system.hardware.vendor" string="System manufacturer">
+ <match key="system.hardware.product" string="P5Q DELUXE">
+ <match key="system.firmware.version" prefix="System Version">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
<match key="system.hardware.version" prefix="P5KR">
<match key="system.hardware.product" prefix="System Version">
<merge key="power_management.quirk.none" type="bool">true</merge>
@@ -64,11 +70,13 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+
<!-- another ASUS Mainboard -->
<match key="system.firmware.version" prefix_outof="ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1201;ASUS M2N32-SLI DELUXE ACPI BIOS Revision 1101;ASUS M2A-VM HDMI ACPI BIOS Revision 1603">
<merge key="power_managiement.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+
<match key="system.firmware.version" prefix="ASUS M2A-VM ACPI BIOS Revision">
<match key="system.firmware.version" contains=" 1101">
<merge key="power_management.quirk.s2_bios" type="bool">true</merge>
commit 240815c54bd8f8f80ba1d2ec2ffd883251e2d84b
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 6 10:41:10 2008 +0200
updated Acer suspend quirks with s2ram whitelist entries from -r1.133
Updated Acer suspend quirks with s2ram whitelist entries from -r1.133.
New:
- TravelMate 6291
- Aspire One 110 (AOA110)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index fdfff81..1d2d555 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -14,7 +14,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_outof="2300;2310;3010;3020;3260">
+ <match key="system.hardware.product" contains_outof="2300;2310;3010;3020;3260;6291">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -139,6 +139,11 @@
</match>
</match>
+ <!-- Aspire One 110 -->
+ <match key="system.hardware.product" prefix="AOA110">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+
</match>
</device>
</deviceinfo>
More information about the hal-commit
mailing list