hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi    |    6 +++---
 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi    |    9 ++++++++-
 fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi |    1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit c361ab68d4128d813eaf0502a6a74d7d13c06aa7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Oct 6 12:10:52 2008 +0200

    added suspend quirks with pci_save from s2ram -r1.133
    
    Added suspend quirks for some machines which are reported in s2ram
    (-r1.133) to need pci_save:
    New:
    - Asus Z35FM
    - Dell Inspiron 5100 (another)
    - comment to FSC S7020, which is already listed, but reported with
      different quirks in s2ram

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 2ab2f38..756143e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -9,13 +9,13 @@
         <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;A6Kt ;F3JC ">
+      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;P5LD2;A8He;A6Kt ;F3JC ;F3Sc">
         <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="F3Sc">
+      <match key="system.hardware.product" prefix="Z35FM ">
         <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 key="system.hardware.product" prefix_outof="A6M;Z84F">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 4be94be..c185479 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -62,7 +62,14 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains=" 5100 ">
-          <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+	  <match key="system.firmware.version" string="Revision A0">
+            <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.firmware.version" contains_not="Revision A0">
+            <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+          </match>
         </match>
         <match key="system.hardware.product" contains_outof="5150;8000;8500">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index a3afd03..d836d5a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -48,6 +48,7 @@
           <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">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.reset_brightness" type="bool">true</merge>