xserver: Branch 'server-1.4-branch' - 2 commits

[Daniel Stone]

 exa/exa_render.c                   |    1 +
 hw/xfree86/common/xf86AutoConfig.c |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 4e5cf76ecaa6b20f825738b07c257f4929e4652a
Author: Mart Raudsepp <mart.raudsepp at artecdesign.ee>
Date:   Fri May 16 20:06:31 2008 +0300

    xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
    
    (cherry picked from commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c)
    (cherry picked from commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd)
    ... and backported to 1.4 (back to no new devprivates and "amd" driver name)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 4f6a98a..703d156 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -160,12 +160,17 @@ videoPtrToDriverName(pciVideoPtr info)
 {
     /*
      * things not handled yet:
-     * amd/cyrix/nsc
-     * xgi
+     * cyrix/nsc.  should be merged into geode anyway.
+     * xgi.
      */
 
     switch (info->vendor)
     {
+	case 0x1022:
+		if (info->chipType == 0x2081)
+			return "amd";
+		else
+			return NULL;
 	case 0x1142:		    return "apm";
 	case 0xedd8:		    return "ark";
 	case 0x1a03:		    return "ast";
commit 22b1a9dd0f68e3307cdcf3e6f8fcaeda34acd483
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Oct 18 17:44:48 2007 +0200

    EXA: Skip empty glyphs. (cherry picked from commit ce50bfd3369686cfecee5a138bd84ef1107a249d)

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 2dd3fc1..ad1c02b 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -1184,6 +1184,7 @@ exaGlyphs (CARD8	op,
 	    y1 = y - glyph->info.y;
 
 	    if (x1 >= pCmpDrw->width || y1 >= pCmpDrw->height ||
+		glyph->info.width == 0 || glyph->info.height == 0 ||
 		(x1 + glyph->info.width) <= 0 || (y1 + glyph->info.height) <= 0)
 		goto nextglyph;