SOURCES: xorg-xserver-server-edid.patch, xorg-xserver-server-exa.patch - up...

[arekm]

Author: arekm                        Date: Wed Nov  5 21:12:15 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   xorg-xserver-server-edid.patch (1.2 -> 1.3) , xorg-xserver-server-exa.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/xorg-xserver-server-edid.patch
diff -u SOURCES/xorg-xserver-server-edid.patch:1.2 SOURCES/xorg-xserver-server-edid.patch:1.3
--- SOURCES/xorg-xserver-server-edid.patch:1.2	Sun Nov  2 16:03:22 2008
+++ SOURCES/xorg-xserver-server-edid.patch	Wed Nov  5 22:12:09 2008
@@ -974,42 +974,4 @@
 -- 
 1.5.6.4
 
-From bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 14 Oct 2008 14:04:01 -0400
-Subject: [PATCH] EDID: Catch even more cases of encoding aspect as size.
-
-Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
-global size record, you also claim to be 160mm by 90mm in the detailed
-timings.  Grrr.
----
- hw/xfree86/ddc/interpret_edid.c |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
-index 3596e87..fbb17b1 100644
---- a/hw/xfree86/ddc/interpret_edid.c
-+++ b/hw/xfree86/ddc/interpret_edid.c
-@@ -115,12 +115,16 @@ handle_edid_quirks(xf86MonPtr m)
- 	    }
- 	}
- 
--	if (real_hsize && real_vsize) {
-+	if (!real_hsize || !real_vsize) {
-+	    m->features.hsize = m->features.vsize = 0;
-+	} else if ((m->features.hsize * 10 == real_hsize) &&
-+		   (m->features.vsize * 10 == real_vsize)) {
-+	    /* exact match is just unlikely, should do a better check though */
-+	    m->features.hsize = m->features.vsize = 0;
-+	} else {
- 	    /* convert mm to cm */
- 	    m->features.hsize = (real_hsize + 5) / 10;
- 	    m->features.vsize = (real_vsize + 5) / 10;
--	} else {
--	    m->features.hsize = m->features.vsize = 0;
- 	}
- 	
- 	xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
--- 
-1.6.0.1
 

================================================================
Index: SOURCES/xorg-xserver-server-exa.patch
diff -u SOURCES/xorg-xserver-server-exa.patch:1.3 SOURCES/xorg-xserver-server-exa.patch:1.4
--- SOURCES/xorg-xserver-server-exa.patch:1.3	Sun Nov  2 16:03:23 2008
+++ SOURCES/xorg-xserver-server-exa.patch	Wed Nov  5 22:12:09 2008
@@ -246,7 +246,7 @@
  ExaOffscreenArea *
  exaOffscreenAlloc(ScreenPtr pScreen, int size, int align,
                    Bool locked,
-@@ -771,30 +786,23 @@ exaOffscreenFree(ScreenPtr pScreen, ExaOffscreenArea *area);
+@@ -786,15 +786,6 @@
  void
  ExaOffscreenMarkUsed (PixmapPtr pPixmap);
  
@@ -262,25 +262,16 @@
  void
  exaEnableDisableFBAccess (int index, Bool enable);
  
-+
-+/* in exa_migration.c */
- void
- exaMoveInPixmap (PixmapPtr pPixmap);
- 
+@@ -808,9 +799,6 @@
  void
  exaMoveOutPixmap (PixmapPtr pPixmap);
  
 -void *
 -exaGetPixmapDriverPrivate(PixmapPtr p);
- 
-+/* in exa_unaccel.c */
+-
  CARD32
  exaGetPixmapFirstPixel (PixmapPtr pPixmap);
  
-+
- /**
-  * Returns TRUE if the given planemask covers all the significant bits in the
-  * pixel values for pDrawable.
 diff --git a/exa/exa_accel.c b/exa/exa_accel.c
 index 3ec9625..1c07a0b 100644
 --- a/exa/exa_accel.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-xserver-server-edid.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-xserver-server-exa.patch?r1=1.3&r2=1.4&f=u