xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 dix/getevents.c                  |    4 ++--
 dix/inpututils.c                 |    6 ------
 hw/xfree86/modes/xf86EdidModes.c |    5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Wed May 27 15:24:34 2009 +1000

    quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 50b669c..e7cb167 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -210,6 +210,11 @@ static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)
 	DDC->vendor.prod_id == 2423)
 	return TRUE;
 
+    /* Peacock Ergovision 19.  See rh#492359 */
+    if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&
+	DDC->vendor.prod_id == 9003)
+	return TRUE;
+
     return FALSE;
 }
 
commit 07154db4a8b96467785fd6be93d20379acacffa8
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Jun 22 08:59:45 2009 -0400

    Xi: Remove redundant and incorrect butmap range check
    
    Maps are CARD8s, therefore checking for values above 255 is completely
    unnecessary. Moreover, 0 is a valid value for maps, so the check wasn't
    even correct to begin with. This fixes bug #22392, which was uncovered
    by commit 280b7f92d729ec910ffa3d18dce7bbc215be7a3c.
    
    Signed-off-by: Ben Gamari <bgamari.foss at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/inpututils.c b/dix/inpututils.c
index 79b6ab7..8194e69 100644
--- a/dix/inpututils.c
+++ b/dix/inpututils.c
@@ -54,12 +54,6 @@ check_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, CARD32 *errval_out,
     for (i = 0; i < len; i++) {
         if (dev->button->map[i + 1] != map[i] && dev->button->down[i + 1])
             return MappingBusy;
-
-        if (map[i] < 1 || map[i] > 255) {
-            if (errval_out)
-                *errval_out = map[i];
-            return -1;
-        }
     }
 
     return Success;
commit 96706c24bd57fbd9b11e5bd5e38d05d81b90aebe
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jun 18 15:40:08 2009 +1000

    dix: fix wrong indices in set_valuator.
    
    Reported-by: Thomas Jaeger
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/getevents.c b/dix/getevents.c
index 7c018c1..a08d4b2 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -175,8 +175,8 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, int first_valuator,
         SetBit(event->valuators.mask, i);
         if (dev->valuator->mode == Absolute)
             SetBit(event->valuators.mode, i);
-        event->valuators.data_frac[first_valuator + i] =
-            dev->last.remainder[first_valuator + i] * (1 << 16) * (1 << 16);
+        event->valuators.data_frac[i] =
+            dev->last.remainder[i] * (1 << 16) * (1 << 16);
     }
 
     memcpy(&event->valuators.data[first_valuator],