hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Mar 18 05:37:20 PDT 2008
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 8 +-
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 5 -
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 10 ++
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 16 +---
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 29 ++++++-
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 8 +-
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 4 -
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 45 ++++++++++++
fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi | 4 -
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 4 -
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 20 +++--
11 files changed, 118 insertions(+), 35 deletions(-)
New commits:
commit c5ea25c8f30414fb9d4f9a487066c85f8d0ae2e2
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 18 13:36:07 2008 +0100
updated suspend quirks with entries from s2ram CVS -r1.116
Updated suspend quirks with whitelist entries from s2ram CVS -r1.116:
- Acer Aspire: 5050, 5100, 5580
- Acer TravelMate: C200
- ASUS: A6G, F3F (comment), ASUS Striker ACPI BIOS Revision
- Compaq: Presario 2701EA
- Dell: Precision WorkStation 360, Vostro 1500
- Fujitsu Amilo: A7640 (updated), M Series, Pi 1505, PRO V2035,
Pro Edition V3505
- Fujitsu Lifebook: E8410, P7010D, S2110
- Gateway MT6707
- HP: 6910p, 8510p, an other nc6120, nc6400 (update), OmniBook XT1000
Presario V3000, Presario V5000, 2x HP Pavilion 061
- IBM: Z60t (2511), a X40
- Lenovo: 6365, 6457, 9452
- MaxSelect Mission_A330
- OEM: MS-7210, rebranded Uniwill P53IN
- Samsung: CoronaR/P35 (comment), SX50S
- Shuttle Inc: SN85V10
- Toshiba: Tecra A2 PTA20E-4M301VGR, Satellite M55, Satellite M70,
fixed entries for P10 and P105, TECRA M9, TECRA S1
- Sony: VGN-B1XP, VGN-SZ340P
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index a3866b9..c809639 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="2450">
+ <match key="system.hardware.product" contains="C200;2450">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
@@ -62,10 +62,10 @@
<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="5630">
+ <match key="system.hardware.product" contains_outof="5050;5630">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="3610;3620;3690">
+ <match key="system.hardware.product" contains_outof="3610;3620;3690;5100">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -76,7 +76,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="1640;3100;5500Z">
+ <match key="system.hardware.product" contains_outof="1640;3100;5500Z;5580">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index f33735c..f0b7ffc 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -8,6 +8,7 @@
<match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne">
<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">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
@@ -30,7 +31,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 ;A6T">
+ <match key="system.hardware.product" prefix_outof="A2H/L ;A6Km ;A6T;A6G">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -53,7 +54,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="ASUS M2N-E ACPI BIOS Revision">
+ <match key="system.firmware.version" prefix="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 33bd847..4c7ca07 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -89,7 +89,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<!-- these need no quirks -->
- <match key="system.hardware.product" contains=" M90 ">
+ <match key="system.hardware.product" contains_outof=" M90 ;WorkStation 360">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -101,6 +101,14 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
</match>
+
+ <!-- Dell Vostro -->
+ <match key="system.hardware.product" prefix="Vostro">
+ <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>
+ </match>
+ </match>
<!-- Dell Inspiron 640m, XPS M1210,
Dell Inspiron E1505 (MM061), note: there are reports for s2ram that no quirks needed-->
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index dea1f1a..69abd8a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -7,11 +7,14 @@
<match key="system.hardware.product" contains_outof="A1667G Serie;Pa 1510;Li 1718">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="Pro V3205;Pro Edition V3405;Xi 1546;Si 1520">
+ <match key="system.hardware.product" contains_outof="Pro V3205;Pro Edition V3405;Pro Edition V3505;Xi 1546;Si 1520;A7640;Pi 1505">
<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="PRO V2030;PRO V8010;Pi 1536">
+ <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">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -21,11 +24,6 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains="A7640">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
<match key="system.hardware.product" contains="A7645">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
@@ -37,10 +35,10 @@
</match>
<match key="system.hardware.product" contains_ncase="lifebook">
- <match key="system.hardware.product" contains="S2110">
+ <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="T4010">
+ <match key="system.hardware.product" contains_outof="E8410;T4010">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index c326008..9f0baa8 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -35,6 +35,21 @@
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</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="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#">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
<match key="system.hardware.product" prefix="N620c ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -53,6 +68,9 @@
<match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV)">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="HP OmniBook XT1000">
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" contains_outof="V3000 (RL377PA#;EW434AVABA;R3000;R4100;nc6000">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
@@ -76,7 +94,8 @@
<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="nc2400;nc6120;nc6320;nx7300;nw8440;6710b">
+ <!-- Note: PY507ET# is a nc6120 -->
+ <match key="system.hardware.product" contains_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b;6910p;8510p;PY507ET#">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -90,13 +109,10 @@
<match key="system.hardware.product" contains="HP Compaq nc6400 ">
<match key="system.hardware.version" prefix="68YCU">
- <match key="system.hardware.product" contains="(EH522AV)">
+ <match key="system.hardware.product" contains_outof="(EH522AV);(EY582ES">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="(EY582ES">
- <merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
</match>
</match>
<match key="system.hardware.product" contains="nc4400">
@@ -184,6 +200,9 @@
<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">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index dead8ee..f46b083 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 -->
- <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2513;2525;2529;2530">
+ <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2529;2530">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -84,6 +84,12 @@
<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 -->
+ <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>
</device>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 68a90d2..31bb5fa 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -5,7 +5,7 @@
<!-- ThinkPads -->
<!-- X60 / X60s / T61 / R61 / X61 Tablet -->
- <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767;7768;7661;7733">
+ <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;6365;7658;8919;7767;7768;7661;7733;9452">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -47,7 +47,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="8895;6460;6464;6465">
+ <match key="system.hardware.product" prefix_outof="8895;6457;6460;6464;6465">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index de9cb5e..b311d12 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -266,6 +266,10 @@
<device>
<match key="system.hardware.vendor" prefix="Gateway">
+ <match key="system.hardware.product" contains="MT6707">
+ <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="MX6922B ">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
@@ -273,6 +277,15 @@
</device>
<device>
+ <match key="system.hardware.vendor" string="MaxSelect">
+ <match key="system.hardware.product" string="Mission_A330">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+
+ <device>
<!-- medion md 96400 -->
<match key="system.hardware.vendor" string="NOTEBOOK">
<match key="system.hardware.product" string="SAM2000">
@@ -313,6 +326,29 @@
</match>
</match>
</match>
+ <match key="system.hardware.product" string="MS-7210">
+ <match key="system.hardware.version" string="100">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+ </device>
+
+ <device>
+ <match key="system.hardware.vendor" string="OEM">
+ <!-- rebranded Uniwill P53IN -->
+ <match key="system.hardware.product" string="P53IN4">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+
+ <device>
+ <match key="system.hardware.vendor" string="OQO">
+ <match key="system.hardware.product" string="ZEPTO">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+ </match>
</match>
</device>
@@ -323,4 +359,13 @@
</match>
</match>
</device>
+
+ <device>
+ <match key="system.hardware.vendor" string="Shuttle Inc">
+ <match key="system.hardware.product" prefix="SN85V10">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </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 a01ace9..5b6c5a2 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>
- <!-- Samsung UMPC, P35 -->
+ <!-- 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">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
@@ -19,7 +19,7 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<!-- these need no quirks to suspend/resume -->
- <match key="system.hardware.product" prefix="R55S ">
+ <match key="system.hardware.product" contains_outof="R55S;SX50S">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 2bb83b5..ca0e4a7 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -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">
+ <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
<match key="system.hardware.product" string="VGN-NR120E">
@@ -31,7 +31,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">
+ <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">
<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) ">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 62066d2..a773559 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -7,18 +7,19 @@
<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; A100; A135; L30">
+ <match key="system.hardware.product" contains_outof="M35X;P200; A100; A135; 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" suffix=" P10">
+ <!-- need exact match for this machine to prevent mixup with P105-->
+ <match key="system.hardware.product" string="Satellite P10">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="P105">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_outof="L10;U305">
+ <match key="system.hardware.product" contains_outof="L10;U305;M55">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -36,11 +37,11 @@
<!-- Tecra Laptops -->
<match key="system.hardware.product" prefix="TECRA">
- <match key="system.hardware.product" contains_outof="8100;8200">
+ <match key="system.hardware.product" contains_outof="8100;8200; M9">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
<!-- these need no quirks-->
- <match key="system.hardware.product" contains=" S3">
+ <match key="system.hardware.product" contains=" S3; S1">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
@@ -80,12 +81,17 @@
<match key="system.hardware.product" string="S1110">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
</match>
- <!-- Toshiba Satellite 4080XCDT -->
+
<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">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <!-- Tecra A2 PTA20E-4M301VGR -->
+ <match key="system.firmware.version" string="Version 1.20">
+ <merge key="power_management.quirk.none" type="bool">true</merge>
+ </match>
</match>
</match>
<match key="system.hardware.product" prefix_outof="P2000;P4000">
More information about the hal-commit
mailing list