hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   26 ++++++++++-----
 1 file changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 43e4229aa995db332611134c52d8e0d0bec5976d
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Oct 30 21:24:25 2007 +0100

    updated Dell suspend quirks with whitelist entries from s2ram
    
    Updated Dell suspend quirks with whitelist entries from s2ram.
    
    Added new machines:
    - Latitude: CPx J800GT, C400, C610, D500, D505, D520, X200
    - Inspiron: 8500, 600m, 640m (MXC061)
    - whitelisted: DXP051, Inspiron: 1300, E1702/E1705, 630m, M1710
    fixed:
    - XPS M1330

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 95a1d79..4c00b3a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -21,18 +21,18 @@
         <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="D410;D420">
+        <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D520;C610">
           <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="D600;D610;D630">
+        <match key="system.hardware.product" contains_outof="C400;D500;D505;D620;D800;X200">
           <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_outof="D620;D800">
+        <match key="system.hardware.product" contains_outof="D600;D610;D630">
           <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="D820">
           <!-- ONLY needed with i810 X.org driver 1.x versions,
@@ -52,10 +52,14 @@
 
       <!-- Dell Inspiron -->
       <match key="system.hardware.product" prefix="Inspiron">
-        <match key="system.hardware.product" contains_outof="5150;8000;1420">
+        <match key="system.hardware.product" contains_outof="1420;5150;8000;8500">
           <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="600m">
+          <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="700m">
         <!-- ONLY needed with i810 X.org driver 1.x versions,
              DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
@@ -72,15 +76,21 @@
         </match>
       </match>
 
-      <!-- Dell XPS M1210 -->
-      <match key="system.hardware.product" prefix="MXC062">
+      <!-- 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 -->
       <match key="system.hardware.product" string="XPS M1330">
           <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.vbemode_restore" 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">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
+
     </match>
   </device>
 </deviceinfo>