hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   17 +++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 1fe59f77592f930e8e195b2a8e0abc5d84db3313
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Sep 10 16:45:48 2008 +0200

    updated Dell suspend quirks with s2ram whitelist entries from -r1.132
    
    Updated Dell suspend quirks with s2ram whitelist entries from -r1.132.
    New:
    - Inspiron: 1525
    - OptiPlex: 755, GX620
    - Precision M6300
    Updated:
    - Latitude D400

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 3ba657c..10510f9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -20,10 +20,7 @@
                need may dpms_on -->
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <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;D430;D520;D530;C610;D620;D830">
+        <match key="system.hardware.product" contains_outof="CPx J800GT;D400;D410;D420;D430;D520;D530;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>
@@ -71,7 +68,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;1420;5160">
+        <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;1525;5160">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
@@ -96,6 +93,10 @@
           <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="M6300 ">
+          <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=" M60">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
@@ -135,9 +136,13 @@
         <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>
 
       <!-- 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">
+      <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>
       </match>