hal-info: Branch 'master' - 10 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Oct 20 07:32:20 PDT 2008
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 14 ++--
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 16 +++-
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 42 ++++++++----
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 8 +-
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 25 +++++--
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 8 +-
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 12 +++
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 12 +--
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 4 -
9 files changed, 97 insertions(+), 44 deletions(-)
New commits:
commit 05cdf8a7f02c27561905285e37a381877831fcbc
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:30:51 2008 +0200
updated misc suspend quirks with s2ram whitelist entries from -r1.134
Updated misc suspend quirks with s2ram whitelist entries from -r1.134.
New:
- JVC J2N
- MEDION WIM 2140
- MICRO-STAR MS-1003
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 00710d5..1809545 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -41,6 +41,13 @@
</match>
</device>
<device>
+ <match key="system.hardware.vendor" string="JVC">
+ <match key="system.hardware.product" string="J2N ">
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+ <device>
<match key="system.hardware.vendor" prefix="LG">
<match key="system.hardware.product" string_outof="M1-3DGBG;W1-JDGBG;LM50-DGHE;LW75-SGGV1">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -192,6 +199,9 @@
<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" string="MS-1003">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
<match key="system.hardware.vendor" prefix="MSI">
<match key="system.hardware.product" string_outof="MS-7350;MS-7207PV;MS-6417;MS-6702">
@@ -224,7 +234,7 @@
<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="MS-7012;M295M;WIM 2000 ">
+ <match key="system.hardware.product" string_outof="MS-7012;M295M;WIM 2000 ;WIM 2140">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit 7c3b408797bfc45d78438f39af454dfdf24e50d3
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:26:09 2008 +0200
updated Sony suspend quirks with s2ram whitelist entries from -r1.134
Updated Sony suspend quirks with s2ram whitelist entries from -r1.134.
New:
- VGN-C240E, VGN-FS215M, VGN-TX670P, VGN-Z90S
Fixed:
- VGN-C2S_H, VGN-FW11 (wider match)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index b4a8e22..918ef26 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -5,14 +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;VGN-C2S_H">
+ <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B">
<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;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>
- <match key="system.hardware.product" contains="PCG-FX601">
+ <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;VGN-C240E;PCG-FX601">
<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 +30,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;VGN-FW11S">
+ <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P;VGN-FW11;VGN-TX670P">
<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 +43,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;VGN-FE890E;VGN-N320E">
+ <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;VGN-C2S_H;VGN-FS215M;VGN-Z90S">
<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 07603d6a8e37afaaabaa78f268baba8a3d6adcc4
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:22:43 2008 +0200
updated Toshiba suspend quirks with s2ram whitelist entries from -r1.134
Updated Toshiba suspend quirks with s2ram whitelist entries from -r1.134.
Fixed:
- Satellite 1130
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 59d296a..b42a2b7 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -4,7 +4,7 @@
<match key="system.hardware.vendor" string="TOSHIBA">
<!-- Satellite Laptops -->
<match key="system.hardware.product" prefix="Satellite">
- <match key="system.hardware.product" contains_outof=" M30X; 1130">
+ <match key="system.hardware.product" contains=" M30X">
<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; A205; A210; L30; M105;M70">
@@ -36,7 +36,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="A30">
+ <match key="system.hardware.product" contains_outof="A30; 1130">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="Pro 6100">
commit 93b5dac870047d0080c5071cd08ba289a7ab685b
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:20:18 2008 +0200
updated Lenovo suspend quirks with s2ram whitelist entries from -r1.134
Updated Lenovo suspend quirks with s2ram whitelist entries from -r1.134.
New:
- another 3000 N200 (0769AH9)
Fixed:
- 6457
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 036b562..1302c66 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -13,6 +13,10 @@
<match key="system.hardware.product" prefix="63664DU">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" prefix="6457">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
<!-- R60 -->
<match key="system.hardware.version" prefix_ncase="ThinkPad R60">
@@ -44,7 +48,7 @@
</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="6457;6460;6465">
+ <match key="system.hardware.product" prefix_outof="6460;6465">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -77,7 +81,7 @@
<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;0769BEG">
+ <match key="system.hardware.product" string_outof="0769B9G;0769BEG;0769AH9">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit c9c8f148e538e1ebeed8d18d79db071f59235329
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:15:59 2008 +0200
updated HP suspend quirks with s2ram whitelist entries from -r1.134
Updated HP suspend quirks with s2ram whitelist entries from -r1.134.
New:
- HP 550
- Presario: 2200, C700
- Pavilion: dv6700, dv9700, xz275, PC098A-ABA M1070N
Fixed:
- HP Compaq 6710b (different versions)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index e8166b4..1840ec2 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -49,7 +49,7 @@
<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="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E);F500 (GF596UA#">
+ <match key="system.hardware.product" contains_outof="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E);F500 (GF596UA#;2200 (PR309UA#;C700 (GV681LA#">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -93,7 +93,7 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- Note: PY507ET# is a nc6120 -->
- <match key="system.hardware.product" contains_outof="nc2400;nx6110;nc6120;nc6320;nx7300;nw8440;6710b;6720s;2710p;8510p;PY507ET#;6715b">
+ <match key="system.hardware.product" contains_outof="nc2400;nx6110;nc6120;nc6320;nx7300;nw8440;6720s;2710p;8510p;PY507ET#;6715b">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -147,6 +147,15 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
+ <match key="system.hardware.product" contains="6710b">
+ <match key="system.hardware.product" contains="KE123EA">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ <match key="system.hardware.product" contains="KE124EA">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ </match>
<match key="system.hardware.product" contains="6710s">
<match key="system.firmware.version" contains="68DDU">
<match key="system.hardware.product" contains="GC014ET">
@@ -217,7 +226,7 @@
<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#">
+ <match key="system.hardware.product" contains_outof="dv4000 (PX306UA#; dv6700 ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -255,20 +264,24 @@
</match>
</match>
- <!-- HP Pavilion ZT1000-IC -->
<match key="system.hardware.product" string="HP Pavilion Notebook PC">
<match key="system.hardware.version" string="HP Pavilion Notebook">
<match key="system.firmware.vendor" string="Insyde Software">
+ <!-- HP Pavilion ZT1000-IC -->
<match key="system.firmware.version" string=" IC.M1.04">
<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.vbemode_restore" type="bool">true</merge>
</match>
+ <!-- HP Pavilion xz275 -->
+ <match key="system.firmware.version" string=" IC.M1.02">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
</match>
</match>
- <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF;ze4900">
+ <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF;ze4900; dv9700 ">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -281,7 +294,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" string_outof="D7223K-ABA A650E;EJ192AA-ABS t3250.se;EP198AA-UUZ t3335.ch;ES061AA-ABD t3320">
+ <match key="system.hardware.product" string_outof="D7223K-ABA A650E;EJ192AA-ABS t3250.se;EP198AA-UUZ t3335.ch;ES061AA-ABD t3320;PC098A-ABA M1070N">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit b036003b4f5894187c9852d8c8eecae71e41e113
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:05:01 2008 +0200
updated FSC suspend quirks with s2ram whitelist entries from -r1.134
Updated FSC suspend quirks with s2ram whitelist entries from -r1.134.
New:
- AMILO Pro Series V3525
- LIFEBOOK: P8010, T3010
Fixed:
- LifeBook S7110
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index d836d5a..222c0eb 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -35,7 +35,7 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="Pro V2040">
+ <match key="system.hardware.product" contains_outof="Pro V2040;Pro Series V3525">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -44,12 +44,12 @@
<match key="system.hardware.product" contains_outof="P7010D;S2110">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="E8410;T4010;S2210">
+ <match key="system.hardware.product" contains_outof="E8410;T4010;S2210;P8010">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- S7020 is also reported with s3_bios/s3_mode/pci_save -->
- <match key="system.hardware.product" contains_outof="S7020;S7110">
+ <match key="system.hardware.product" contains="S7020">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.reset_brightness" type="bool">true</merge>
</match>
@@ -76,7 +76,7 @@
<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">
+ <match key="system.hardware.product" contains_outof="B Series;T Series;S7010;S7110;E8110;T301;T3010">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit f3d6d30ba0db10d237346b49dee789999310ac50
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 16:01:01 2008 +0200
updated Dell suspend quirks with s2ram whitelist entries from -r1.134
Updated Dell suspend quirks with s2ram whitelist entries from -r1.134.
New:
- Latitude LS
- OptiPlex 170L
- Vostro 1000
- Dimension 9100
Reorganised OptiPlex machines, put them together.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index c185479..75a662a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -47,7 +47,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<!-- these need no quirks -->
- <match key="system.hardware.product" contains="CPx J650GT">
+ <match key="system.hardware.product" contains_outof="CPx J650GT;LS ">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -119,7 +119,7 @@
<!-- Dell Dimension -->
<match key="system.hardware.product" prefix="Dimension">
- <match key="system.hardware.product" contains_outof="2400;3000">
+ <match key="system.hardware.product" contains_outof="2400;3000;9100">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -127,6 +127,10 @@
<!-- Dell Vostro -->
<match key="system.hardware.product" prefix="Vostro">
+ <match key="system.hardware.product" contains=" 1000 ">
+ <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=" 1500">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
@@ -136,27 +140,37 @@
</match>
</match>
+ <!-- Dell OptiPlex -->
+ <match key="system.hardware.product" prefix_ncase="OptiPlex">
+ <match key="system.hardware.product" contains_outof="GX520;GX260">
+ <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="755">
+ <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="fx160">
+ <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="170L;GX620">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
+
<!-- Dell Inspiron 640m, XPS M1210 -->
<match key="system.hardware.product" contains_outof="MXC061;MXC062">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</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;OptiPlex GX260">
+ <!-- Dell XPS M1330, MM061 = Inspiron E1505 or/and 6400 -->
+ <match key="system.hardware.product" contains_outof="XPS M1330;MM061;">
<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="OptiPlex 755">
- <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 : 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">
+ <match key="system.hardware.product" contains_outof="DM061 ;DXP051;ME051;MP061;MXC051;MXG061;XPS M1530">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
commit 71a8596afe62f4d5abec11ee62251d7b7395da84
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 15:54:21 2008 +0200
fixed typo from commit 39c1f01f
Fixed typo from commit 39c1f01f.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 28cee94..19c1873 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -83,7 +83,7 @@
<!-- 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;ASUS A7V8X-X ACPI BIOS Revision">
- <merge key="power_managiement.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
commit 834053ac81f22c2bf3284363fa58ab0f46cf5f33
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 15:52:47 2008 +0200
updated Asus suspend quirks with s2ram whitelist entries from -r1.134
Updated Asus suspend quirks with s2ram whitelist entries from -r1.134.
New:
- EEE 1000H
- F3Ka, V1J, ASUS A7V8X-X ACPI BIOS Revision
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 756143e..28cee94 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -27,6 +27,16 @@
<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="F3Ka">
+ <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" prefix="V1J ">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+ </match>
<!-- Z91E is identified as A3E -->
<match key="system.hardware.product" prefix_outof="A6J ;A6U;A3E;F3JP">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -38,7 +48,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;A8JS ;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;1000H">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -72,7 +82,7 @@
</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">
+ <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;ASUS A7V8X-X ACPI BIOS Revision">
<merge key="power_managiement.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
commit 1b8bce5a0492995fb8f89d78574a6821a4b2ef3b
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Oct 20 15:47:22 2008 +0200
updated Acer suspend quirks with s2ram whitelist entries from -r1.134
Updated Acer suspend quirks with s2ram whitelist entries from -r1.134.
New:
- Aspire One 150 (AOA150)
- Aspire: 1670, 4520, 5920G
- TravelMate 6492
- Xspire 1650
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 1d2d555..1d6c514 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -24,7 +24,7 @@
<match key="system.hardware.product" contains="6460">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="C200;2450;4400">
+ <match key="system.hardware.product" contains_outof="C200;2450;4400;6492">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
@@ -59,7 +59,7 @@
<match key="system.hardware.product" contains="5050">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="3610;3620;3690;5630">
+ <match key="system.hardware.product" contains_outof="1670;3610;3620;3690;5630">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -97,7 +97,7 @@
<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="2920;3100;5500Z;5580">
+ <match key="system.hardware.product" contains_outof="2920;3100;4520;5500Z;5580;5920G">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -133,6 +133,12 @@
</match>
</match>
+ <match key="system.hardware.product" prefix="Xspire">
+ <match key="system.hardware.product" contains="1650">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
+
<match key="system.hardware.product" prefix="AcerPower">
<match key="system.hardware.product" contains="2000">
<merge key="power_management.quirk.none" type="bool">true</merge>
@@ -140,7 +146,7 @@
</match>
<!-- Aspire One 110 -->
- <match key="system.hardware.product" prefix="AOA110">
+ <match key="system.hardware.product" prefix_outof="AOA110;AOA150">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
More information about the hal-commit
mailing list