xf86-video-ati: Branch 'master'

[Michel Dänzer]

 configure.ac       |    2 +-
 src/radeon_dri3.c  |   37 +++----------------------------------
 src/radeon_probe.h |    1 -
 3 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 8a6cd4bda05b9569b3dd0a5a75b2cc385b9ecba9
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Mar 25 11:50:15 2016 +0900

    Revert "Use render node for DRI3 if available"
    
    This reverts commit cd94248ffa7d8fe0b57476f79e7e860dee66d1b0.
    
    It broke VDPAU<->GL interop with DRI3 enabled, because the Gallium VDPAU
    code doesn't support DRI3 yet. We can consider re-enabling this once
    there is a Mesa release where the Gallium VDPAU code supports DRI3.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94675
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/configure.ac b/configure.ac
index a4963c3..2409004 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for libraries.
-PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.60])
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.58])
 PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon])
 
 # Obtain compiler/linker options for the driver dependencies
diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c
index de97f39..1415a0d 100644
--- a/src/radeon_dri3.c
+++ b/src/radeon_dri3.c
@@ -39,7 +39,9 @@
 #include <fcntl.h>
 #include <errno.h>
 
-static int open_master_node(ScreenPtr screen, int *out)
+
+static int
+radeon_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
 	RADEONInfoPtr info = RADEONPTR(scrn);
@@ -84,36 +86,6 @@ static int open_master_node(ScreenPtr screen, int *out)
 	return Success;
 }
 
-static int open_render_node(ScreenPtr screen, int *out)
-{
-	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-	RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
-	int fd;
-
-	fd = open(pRADEONEnt->render_node, O_RDWR | O_CLOEXEC);
-	if (fd < 0)
-		return BadAlloc;
-
-	*out = fd;
-	return Success;
-}
-
-static int
-radeon_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out)
-{
-	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-	RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
-	int ret = BadAlloc;
-
-	if (pRADEONEnt->render_node)
-		ret = open_render_node(screen, out);
-
-	if (ret != Success)
-		ret = open_master_node(screen, out);
-
-	return ret;
-}
-
 static PixmapPtr radeon_dri3_pixmap_from_fd(ScreenPtr screen,
 					    int fd,
 					    CARD16 width,
@@ -218,9 +190,6 @@ Bool
 radeon_dri3_screen_init(ScreenPtr screen)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-	RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
-
-	pRADEONEnt->render_node = drmGetRenderDeviceNameFromFd(pRADEONEnt->fd);
 
 	if (!dri3_screen_init(screen, &radeon_dri3_screen_info)) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 36e2ff6..258c7be 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -142,7 +142,6 @@ typedef struct
 #ifdef XSERVER_PLATFORM_BUS
     struct xf86_platform_device *platform_dev;
 #endif
-    char *render_node;
 } RADEONEntRec, *RADEONEntPtr;
 
 extern const OptionInfoRec *RADEONOptionsWeak(void);