xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon_kms.c    |    6 +++++-
 src/radeon_output.c |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit cb4dc7ab66016d0c980800f8dbf71bbe993889d3
Author: Sedat Dilek <sedat.dilek at gmail.com>
Date:   Fri Feb 25 17:21:52 2011 -0500

    kms: Fix warning XNFprintf is deprecated
    
    Noticed when building ati/radeon ddx against xserver 1.10-rc3.
    
    [ build.log ]
    ../../src/radeon_kms.c:412:5: warning: 'XNFprintf' is deprecated (declared at /usr/include/xorg/os.h:273)
    
    agd5f: don't break the build against pre-1.10 xservers.
    
    Signed-off-by: Sedat Dilek <sedat.dilek at gmail.com>
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 158dc57..82ee660 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -408,9 +408,13 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn)
 	info->dri2.drm_fd = pRADEONEnt->fd;
 	goto out;
     }
-
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
+    busid = XNFasprintf("pci:%04x:%02x:%02x.%d",
+			dev->domain, dev->bus, dev->dev, dev->func);
+#else
     busid = XNFprintf("pci:%04x:%02x:%02x.%d",
 		      dev->domain, dev->bus, dev->dev, dev->func);
+#endif
 
     info->dri2.drm_fd = drmOpen("radeon", busid);
     if (info->dri2.drm_fd == -1) {
commit ecfdb209afe2aafc378baab8c511f5df7b000270
Author: Sedat Dilek <sedat.dilek at googlemail.com>
Date:   Fri Feb 25 21:48:14 2011 +0100

    UMS: Fix build against xserver 1.10-rc3
    
    This issue was introduced due to last minute backout of RandR-1.4
    in xserver 1.10-rc3.
    
    Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard.
    See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
    
    Note:
    The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
    
    Reported-by: Alex Deucher <alexdeucher at gmail.com>
    CC: Keith Packard <keithp at keithp.com>
    Signed-off-by: Sedat Dilek <sedat.dilek at gmail.com>

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 15cef06..ccde346 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output)
 	xf86CrtcPtr crtc = output->crtc;
 
 	if (crtc->enabled) {
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
+#ifdef RANDR_14_INTERFACE
 	    xf86CrtcSetRec crtc_set_rec;
 
 	    crtc_set_rec.flags = (XF86CrtcSetMode |