hal-info: Branch 'master' - 11 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Apr 16 12:05:40 PDT 2008
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 5 +-
fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi | 11 +++--
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 10 ++--
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 6 +-
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 8 +--
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 26 +++++++-----
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 9 +++-
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 12 +----
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 17 ++++++-
fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 12 +++--
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 15 +++++-
12 files changed, 83 insertions(+), 50 deletions(-)
New commits:
commit 70ea99cb8b668367646fa284c6d7f3634b3041f7
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 21:03:49 2008 +0200
updated misc. suspend quirks with s2ram whitelist entries from -r1.121
Updated misc. suspend quirks with s2ram whitelist entries from -r1.121:
- BenQ Joybook S52
- Gigabyte Technology: 945GCMX-S2, P35-DS4
- MICRO-STAR: MS-1012
- Shuttle Inc: SD11V10
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 8006305..bd62122 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -81,6 +81,10 @@
<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="Joybook S52">
+ <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>
@@ -123,7 +127,7 @@
<device>
<match key="system.hardware.vendor" prefix_ncase="micro-star">
- <match key="system.hardware.product" string="MS-1013">
+ <match key="system.hardware.product" string="MS-1012;MS-1013">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="PR210">
@@ -263,6 +267,10 @@
<match key="system.hardware.product" string="945GZM-S2">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" string_outof="945GCMX-S2;P35-DS4">
+ <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>
@@ -373,13 +381,16 @@
<device>
<match key="system.hardware.vendor" string="Shuttle Inc">
- <match key="system.hardware.product" string="SN85V10">
- <merge key="power_management.quirk.none" type="bool">true</merge>
+ <match key="system.hardware.product" string="SD11V10">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="SN41UV10">
<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" string="SN85V10">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
</device>
commit d05e3007d00390a3e6e92aaadc775cc5411985ae
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 20:51:31 2008 +0200
updated Sony suspend quirks with s2ram whitelist entries from -r1.121
Updated Sony suspend quirks with s2ram whitelist entries from -r1.121:
- added: VGN-FS485B, VGN-FZ39VN, VGN-SZ61XN_C, VGN-TX770P, PCG-FX805
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 4bbfad4..8260f78 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -2,7 +2,7 @@
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" string="Sony Corporation">
- <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612">
+ <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -13,7 +13,7 @@
<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">
+ <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-SZ61XN_C">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="VGN-NR120E">
@@ -29,16 +29,20 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="PCG-Z1RMP">
+ <match key="system.hardware.product" contains_outof="PCG-Z1RMP;VGN-TX770P">
<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="PCG-FX805">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
<!-- machines which need no quirks -->
<!-- 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)">
+ <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">
<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 8d490d5352bb5601a94121c3fb894dff2f69a58a
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 20:40:36 2008 +0200
updated Samsung/Toshiba suspend quirks with s2ram entries from -r1.121
Updated Samsung and Toshiba suspend quirks with s2ram whitelist entries
from -r1.121:
- Samsung: SQ35S
- Toshiba:
- Satellite: P100, A215
- Tecra A8
- PORTEGE 100
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 785015f..0ceeb4d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -6,7 +6,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="SQ30">
+ <match key="system.hardware.product" string="SQ30;SQ35S">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<!-- Samsung UMPC, P35 (NOTE: there is a s2ram report for CoronaR to need no quirks)-->
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index d4f39af..9f010ca 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -7,10 +7,17 @@
<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="M35X;P200; P205D; A100; A105; A135; A200; A210; L30;M70">
+ <match key="system.hardware.product" contains_outof="M35X;P100;P200; P205D; A100; A105; A135; A200; A210; L30;M70">
<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=" A215">
+ <!-- This machine need a special new quirk: power_management.quirk.pci_save
+ <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>
<!-- need exact match for this machine to prevent mixup with P105 or A100-->
<match key="system.hardware.product" string_outof="Satellite P10;Satellite A10">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -44,7 +51,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- these need no quirks-->
- <match key="system.hardware.product" contains_outof=" A9; S3; S1">
+ <match key="system.hardware.product" contains_outof=" A8; A9; S3; S1">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -87,8 +94,8 @@
<match key="system.hardware.product" string="Portable PC">
<match key="system.hardware.version" string="Version 1.0">
- <!-- Toshiba Satellite 4080XCDT -->
- <match key="system.firmware.version" string="Version 7.80">
+ <!-- PORTEGE 100, Toshiba Satellite 4080XCDT -->
+ <match key="system.firmware.version" string_outof="Version 1.60;Version 7.80">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- Tecra A2 PTA20E-4M301VGR -->
commit 7ce09b1470b25ef2600213ec423722d6a4292b0a
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 20:29:54 2008 +0200
updated Lenovo suspend quirks with s2ram whitelist entries from -r1.121
Updated Lenovo suspend quirks with s2ram whitelist entries from -r1.121.
The majority of the entries (65 new, 12 fixed/updated) has been reported
by Lenovo via Novell bugzilla:
- https://bugzilla.novell.com/show_bug.cgi?id=334518
- https://bugzilla.novell.com/show_bug.cgi?id=334522
- https://bugzilla.novell.com/show_bug.cgi?id=353896
- https://bugzilla.novell.com/show_bug.cgi?id=370690
* updated: 6466, 6464, 8895, 8897, 7732, 7669, 7673, 7674, 7675, 7764,
8932, 8943
(please report problems, if one of this machines no longer work)
* new: 6463, 6465, 6467, 6468, 6471, 8938, 8939, 7659, 7660, 6378, 6379,
6480, 8896, 8898, 8899, 8900, 7734, 7735, 7736, 7737, 7738, 7667,
7670, 7671, 7676, 7678, 7679, 4108, 4141, 4143, 7762, 7763, 7642,
7643, 7644, 7645, 7646, 7647, 7648, 7649, 7650, 7657, 8930, 8933,
8934, 8935, 8936, 8937, 8942, 8944, 8945, 8946, 8947, 8948, 6476,
6477, 6478, 2478, 2479
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 0da863d..85c9666 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -4,15 +4,11 @@
<match key="system.hardware.vendor" string="LENOVO">
<!-- ThinkPads -->
- <!-- X60 / X60s / T61 / T61p / R61 / R61s / X61 Tablet -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;6365;6458;7658;7661;7666;7668;7733;7738;7767;7768;8919;9452">
+ <!-- X60 / X60s / T61 / T61p / R61 / R61s / X61(s/Tablet) / X300 -->
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;2478;2479;4108;4141;4143;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">
<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) -->
- <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">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
@@ -42,12 +38,12 @@
</match>
<!-- T61 -->
- <match key="system.hardware.product" prefix_outof="6466;7663">
+ <match key="system.hardware.product" prefix="7663">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</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;6464;6465;8895;8897;8943">
+ <match key="system.hardware.product" prefix_outof="6457;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>
commit 861f8ad7c60e4f2fea13bb89d813d673241d640d
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 19:30:08 2008 +0200
updated IBM suspend quirks with s2ram whitelist entries from -r1.121
Updated IBM suspend quirks with s2ram whitelist entries from -r1.121:
- added: a X41 (2526), a T40 (1RETDRWW)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index a181c39..48a79ed 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -44,7 +44,7 @@
</match>
</match>
<!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m, T32 (2647) -->
- <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2529;2530;2647">
+ <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2526;2529;2530;2647">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -84,12 +84,17 @@
<match key="system.hardware.product" prefix_outof="2628;2629;2658;2681;2722">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
- <!-- need no quirks: a X40 -->
+ <!-- need no quirks: a X40, T40 -->
<match key="system.hardware.version" string="ThinkPad X40">
<match key="system.firmware.version" prefix="1UETD2WW">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
+ <match key="system.hardware.version" string="ThinkPad T40 ">
+ <match key="system.firmware.version" prefix="1RETDRWW">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
</match>
</device>
commit 6473ea3c00c745053acfdc90fbaab998f65fb3d0
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 19:26:04 2008 +0200
updated HP suspend quirks with s2ram whitelist entries from -r1.121
updated HP suspend quirks with s2ram whitelist entries from -r1.121:
- added:
- Presario: 2100 (DP835E)
- Pavilion: ES061AA-ABD t3320, RZ418AA-ABH s3020, HP d530 SFF
- 2710p, 6715b
- fixed: Pavilion dv6500
NOTE: last commit wasn't for HP, it was for FSC
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index b1a0145..30416c4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -37,16 +37,16 @@
</match>
<match key="system.hardware.product" prefix="Presario">
- <match key="system.hardware.product" contains="2701EA">
- <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="2701EA">
+ <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="V3000 (EZ674UA#">
<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#">
+ <match key="system.hardware.product" contains_outof="V3000 (EZ755UA#;V5000 (ET826UA#;2100 (DP835E)">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -95,7 +95,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;nc6120;nc6320;nx7300;nw8440;6710b;6720s;6910p;8510p;PY507ET#">
+ <match key="system.hardware.product" contains_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b;6720s;2710p;6910p;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>
@@ -153,7 +153,7 @@
<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_outof="dv4000 (EB911EA#; dv2600">
+ <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="zd8000 (EL030EA#">
@@ -190,7 +190,7 @@
</match>
</match>
- <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP Pavilion dv6500 Notebook PC">
+ <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -203,10 +203,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" string_outof="D7223K-ABA A650E;EJ192AA-ABS t3250.se;EP198AA-UUZ t3335.ch">
+ <match key="system.hardware.product" string_outof="D7223K-ABA A650E;EJ192AA-ABS t3250.se;EP198AA-UUZ t3335.ch;ES061AA-ABD t3320">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
+ <match key="system.hardware.vendor" prefix="HP-Pavilion">
+ <match key="system.hardware.product" contains="RZ418AA-ABH s3020">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
+ </match>
+
</device>
</deviceinfo>
commit 80d3fa615299a7b43de90840c3c4a2e1331cd0c6
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 19:10:29 2008 +0200
updated HP suspend quirks with s2ram whitelist entries from -r1.121
Updated HP suspend quirks with s2ram whitelist entries from -r1.121:
- new Amilo: D Series, Pi 2515
- new Lifebook: S6410, P7230, S7110
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 2d6e27d..2d73b4a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -14,7 +14,7 @@
<match key="system.hardware.product" string="M Series">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="PRO V2030;PRO V2035;PRO V8010;Pi 1536">
+ <match key="system.hardware.product" contains_outof="Amilo D Series;PRO V2030;PRO V2035;PRO V8010;Pi 1536;Pi 2515">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -54,7 +54,7 @@
<match key="system.hardware.product" contains_outof="E4010;P7120">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="E8020">
+ <match key="system.hardware.product" contains_outof="E8020;S6410">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -65,14 +65,14 @@
<merge key="power_management.quirk.pci_save" type="bool">true</merge>
</match>
-->
- <match key="system.hardware.product" contains="T4210">
+ <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.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">
+ <match key="system.hardware.product" contains_outof="B Series;T Series;S7010;S7110">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
commit 3d6e01499a5ba29be4472ed8dca0acd141e2b0f8
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 19:05:09 2008 +0200
updated Dell suspend quirks with s2ram whitelist entries from -r1.121
Updated Dell suspend quirks with s2ram whitelist entries from -r1.121:
- added new: Latitude D430, Inspiron 5160, 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 8147cae..c9c4669 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -19,7 +19,7 @@
<match key="system.hardware.product" contains="D400">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D520;C610;D620;D830">
+ <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D430;D520;C610;D620;D830">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -59,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_outof="500m;600m;1100">
+ <match key="system.hardware.product" contains_outof="500m;600m;1100;5160">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -125,7 +125,7 @@
</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">
+ <match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX260">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
commit 634d8b06d819104d96f7d3d1b9445ae5134b978f
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 19:00:59 2008 +0200
updated Asus suspend quirks with s2ram whitelist entries from -r1.121
Updated Acer suspend quirks with s2ram whitelist entries from -r1.121:
- added: M51Sr, F3JC, U3S, A6K
- added mainboards: K8V-MX, ASUS A7V ACPI BIOS Revision
- fixed: A6Kt
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 2dc4fec..448d1ca 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -5,18 +5,18 @@
<match key="system.hardware.product" prefix_outof="U5F ;M2000E">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne">
+ <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;M51Sr ">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
- <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;P5LD2;A8He">
+ <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;P5LD2;A8He;A6Kt ;F3JC ">
<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_outof="A6M;Z84F">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix_outof="L3000D;M3N ">
+ <match key="system.hardware.product" prefix_outof="L3000D;M3N ;U3S ">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -34,7 +34,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;A6Kt;A6T;A6G;A6VA;F3T">
+ <match key="system.hardware.product" prefix_outof="A2H/L;A6Km;A6K ;A6T;A6G;A6VA;F3T;K8V-MX">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -66,7 +66,7 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
<!-- another ASUS Mainboard, this need no quirk -->
- <match key="system.firmware.version" prefix_outof="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision">
+ <match key="system.firmware.version" prefix_outof="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision;ASUS A7V ACPI BIOS Revision">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
commit 2bad9c9eff8b3f54979e7cdf58574b041ea40cc4
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 18:50:40 2008 +0200
updated Acer suspend quirks with s2ram whitelist entries from -r1.121
Updated Acer suspend quirks with s2ram whitelist entries from -r1.121:;
- added: TM 7520, Aspire 1650
- fixed: Ferrari 5000
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 136a262..3501a53 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -18,7 +18,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="8000">
+ <match key="system.hardware.product" contains_outof="7520;8000">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="6460">
@@ -85,7 +85,7 @@
<match key="system.hardware.product" contains="1640">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="1520;3000;5110;5570;5920">
+ <match key="system.hardware.product" contains_outof="1520;1650;3000;5110;5570;5920">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -117,6 +117,7 @@
<!-- does not work with fglrx -->
<match key="system.hardware.product" contains="5000">
<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>
commit d78a05e9375a2dac08e92c1b88558a5d441eb80f
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 16 18:43:13 2008 +0200
updated Apple suspend quirks with s2ram whitelist entries from -r1.121
Updated Apple suspend quirks with s2ram whitelist entries from -r1.121.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 2d5bb2e..2a49ece 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -14,10 +14,7 @@
</match>
</match>
- <match key="system.hardware.product" string="MacBook1,1">
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" string="MacBook3,1">
+ <match key="system.hardware.product" string_outof="MacBook1,1;MacBook3,1">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -28,6 +25,12 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+
+ <!-- works only from X -->
+ <match key="system.hardware.product" string="MacBookPro4,1">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+
</match>
</device>
</deviceinfo>
More information about the hal-commit
mailing list