hal: Branch 'origin' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

New commits:
diff-tree dd2df012362d608e50b52dee5cf9f6e4903bc229 (from 86b8417a8757a0d679c75bde7b8082a8cddaef86)
Author: Matthias Saou <thias at freshrpms.net>
Date:   Tue Jun 5 11:45:46 2007 +0100

    apply quirk for Dell Latitude X1
    
    Here is the small change required to get my Dell Latitude X1 laptop to
    resume properly from S3 on Fedora 7. Without this quirk, the screen
    stays off. With, it resumes fine. Tested for the last couple of days.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 62a033d..6245568 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -38,6 +38,9 @@
           <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" suffix="X1">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
       </match>
       <match key="system.hardware.product" prefix="Inspiron">
         <match key="system.hardware.product" contains="5150">
diff-tree 86b8417a8757a0d679c75bde7b8082a8cddaef86 (from c4b358abcf2e627109426db222c94244e4115124)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jun 5 10:21:51 2007 +0100

    add quirk for Dell E1505
    
    Add a quirk for Dell E1505, patch originally supplied by
    John H. <mistamaila at gmail.com> but demangled by me.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 37bc130..62a033d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -44,8 +44,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="700m">
-	<!-- ONLY needed with i810 X.org driver 1.x versions,
+        <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)
 	     <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
 	     <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
@@ -57,6 +57,11 @@
           <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="MM061">
+          <merge key="power_management.quirk.dpms_on" 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>
     </match>
   </device>