xf86-video-ati: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 720dd07e79b5f5cbbf3ef8bd92300578c485d583
Author: Jammy Zhou <Jammy.Zhou at amd.com>
Date:   Mon Dec 19 17:27:19 2016 +0900

    Use render node for DRI3 if available
    
    Signed-off-by: Jammy Zhou <Jammy.Zhou at amd.com>
    (ported from amdgpu commit ea558e645786b08d75307716036045170e97b43e)
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    [ Second attempt, let's see if there's any fallout this time... ]

diff --git a/configure.ac b/configure.ac
index 276ef1d..48281e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for libraries.
-PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.58])
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.60])
 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 c567024..fa24aba 100644
--- a/src/radeon_dri3.c
+++ b/src/radeon_dri3.c
@@ -40,9 +40,7 @@
 #include <errno.h>
 #include <libgen.h>
 
-
-static int
-radeon_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out)
+static int open_master_node(ScreenPtr screen, int *out)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
 	RADEONInfoPtr info = RADEONPTR(scrn);
@@ -87,6 +85,36 @@ radeon_dri3_open(ScreenPtr screen, RRProviderPtr provider, 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;
+}
+
 #if DRI3_SCREEN_INFO_VERSION >= 1 && XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1,18,99,1,0)
 
 static int
@@ -228,6 +256,9 @@ 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 bc5b53d..9e50c81 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -145,6 +145,7 @@ typedef struct
 #ifdef XSERVER_PLATFORM_BUS
     struct xf86_platform_device *platform_dev;
 #endif
+    char *render_node;
 } RADEONEntRec, *RADEONEntPtr;
 
 extern const OptionInfoRec *RADEONOptionsWeak(void);