hal: Branch 'origin' - 4 commits

[David Zeuthen]

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

New commits:
diff-tree 3b5fc843e63dee19e0c7ce06f1c6b1f2d7cb6b8e (from parents)
Merge: 7c3b5a6555dabe081b003fe54354bb5e97873f1e 3774ccf610357268e6d878dd03aa95687be707f7
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jun 25 23:19:32 2007 +0100

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

diff-tree 7c3b5a6555dabe081b003fe54354bb5e97873f1e (from dbc8ea9e8a6a8788828ce7cc13408949017e6d67)
Author: Nelson Strother <xunilarodef at gmail.com>
Date:   Mon Jun 25 10:05:04 2007 +0100

    fix dell latitude c800 video quirk
    
      On a Dell Latitude C800 with no quirks, resume from hibernation
    does not restore a useable X session (i.e. a casual observer would
    state resume from hibernation fails).  One way to entice the resume
    to function correctly is via the quirk vbemode_restore, as included
    in the attached patch for hal-info.  (When resuming into tty1, only
    selected characters in the lines above the initial prompt are
    visibly displayed, but all characters on the initial prompt line
    and following are correctly displayed.)
    
      I was cheeky enough to sort the matches within the Latitude group,
    as well as adding a new match.  While the software should do quite
    well with these matches in random order, the human updaters may have
    less confusion if these remain sorted.  If someone thinks this is
    helpful, they may like to also sort Inspiron before Latitude,
    etc. so that there should be even less of a risk of the file confusing
    its human readers.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 074e195..0a7c229 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -3,6 +3,12 @@
   <device>
     <match key="system.hardware.vendor" prefix="Dell">
       <match key="system.hardware.product" prefix="Latitude">
+        <match key="system.hardware.product" contains="C600">
+          <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains="C800">
+          <merge key="power_management.quirk.vbemode_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>
@@ -16,6 +22,11 @@
                DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> -->
         </match>
+        <match key="system.hardware.product" contains="D600">
+          <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="D610">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -37,14 +48,6 @@
           <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="C600">
-          <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
-        </match>
-        <match key="system.hardware.product" contains="D600">
-          <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" suffix="X1">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
diff-tree dbc8ea9e8a6a8788828ce7cc13408949017e6d67 (from 01c666f841a0c3ba97e186ce6d10436ce2b4c6ea)
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Sat Jun 23 21:03:48 2007 +0100

    It seems that I was using an older version of the intel i810 driver
    combined with 915resolution. I have recently upgraded to the same
    versions you are using and now I can no longer succesfully resume.
    
    The quirks that make it work for me now are:
    
    <match key=system.hardware.product contains=D820>
      <merge key=power_management.quirk.dpms_on type=bool>true</merge>
      <merge key=power_management.quirk.vbemode_restore type=bool>true</merge>
    </match>

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 04f5595..074e195 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -30,8 +30,12 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains="D820">
+          <!-- 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.vbestate_restore" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>-->
+          <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains="C600">
           <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
diff-tree 3774ccf610357268e6d878dd03aa95687be707f7 (from 01c666f841a0c3ba97e186ce6d10436ce2b4c6ea)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Jun 18 13:55:28 2007 -0400

    version 20070618

diff --git a/VERSION b/VERSION
index 735a63f..3e2957c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070516
+20070618