hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   16 ++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit c201727c87112f658eb7a30bab8b7677f802b6c2
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 15:16:57 2008 +0100

    updated Dell quirks with entries from s2ram CVS -r1.118
    
    Updated Dell quirks with entries from s2ram whitelist CVS -r1.118:
    - added: Precision M4300, XPS M1530
    - added comment about Inspiron 1420
    - updated: MM061 to use vbe_post and vbemode_restore since this worked to
               all in fd.o bug #14067, comment #2 and to the reporter for
               the s2ram whitelist.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 4c7ca07..dd6ed23 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -56,6 +56,8 @@
         <match key="system.hardware.product" contains=" 5100 ">
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
+        <!-- The 1420 match is from a 1420n, there is a report for a 1420 in 
+             the s2ram whitelist to work with vbe_post + vbemode_restore -->
         <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>
@@ -89,7 +91,7 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
         <!-- these need no quirks -->
-        <match key="system.hardware.product" contains_outof=" M90 ;WorkStation 360">
+        <match key="system.hardware.product" contains_outof=" M90 ;WorkStation 360; M4300">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>
@@ -110,19 +112,19 @@
         </match>
       </match>
       
-      <!-- Dell Inspiron 640m, XPS M1210,
-           Dell Inspiron E1505 (MM061), note: there are reports for s2ram that no quirks needed-->
-      <match key="system.hardware.product" contains_outof="MXC061;MXC062;MM061">
+      <!-- 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, OptiPlex GX520 (desktop with intel) -->
-      <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520">
+      <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel) 
+           MM061 = Inspiron E1505 or/and 6400 -->
+      <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520;MM061">
         <merge key="power_management.quirk.vbe_post" 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">
+      <match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061;XPS M1530">
           <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>