hal: Branch 'origin' - 3 commits

[David Zeuthen]

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

New commits:
diff-tree 9e59ecd6c5bdc4449f1f0eb01d5671b1fd469cc4 (from c2dd3fdd1c524b4c44b48ad9e012bdce414f4063)
Author: Doncho N. Gunchev <gunchev at gmail.com>
Date:   Fri Jun 1 15:24:20 2007 +0100

    add Acer Aspire 5610 to quirk database
    
    Here's what I did for my Acer Aspire 5610. I have no idea how it was working
    before (suspend to ram) with FC6, but with FC7 I need this and the pm-utils
    from FC8 ;-) to make the display wake up. If I don't use
    'pm-suspend --quirks-vbe-post' everything works but the display is dark.
    I can pm-suspend, wake it up, 'pm-suspend --quirks-vbe-post' and then
    after the resume the screen is full with blinking strange characters (one
    character all over the screen).

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index db3ba9f..483d814 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -55,6 +55,9 @@
           <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" contains="5610">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
       </match>
       <match key="system.hardware.product" string="Extensa 4150">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff-tree c2dd3fdd1c524b4c44b48ad9e012bdce414f4063 (from parents)
Merge: c599f234fbf6fcf5d0fc4d4d015278077f349d02 39e1426d05f3907cd1f8973098a521ab2a6484cc
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jun 1 12:37:49 2007 +0100

    Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info

diff-tree c599f234fbf6fcf5d0fc4d4d015278077f349d02 (from 5738b123c73897d7db74f5432d1f22302c19538d)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Fri Jun 1 12:36:08 2007 +0100

    add quirk for Dell 700M.
    
    Add a quirk for Dell 700M. Original data from Leo <sdl.web at gmail.com> and
    patch prepared by Frederic Crozat <fcrozat at mandriva.com>, many thanks.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 90a7cb7..37bc130 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -44,6 +44,15 @@
           <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,
+             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>
+	     <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+	     <merge key="power_management.quirk.vga_mode3" type="bool">true</merge> -->
+             <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains="8000">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>