XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-24 01:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use render node for DRI3 if available

Browse Source 
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
(ported from amdgpu commit ea558e645786b08d75307716036045170e97b43e)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
[ Second attempt, let's see if there's any fallout this time... ]
This commit is contained in:
Jammy Zhou
2016-12-19 17:27:19 +09:00
committed by Michel Dänzer
parent 92fc387a62
commit 720dd07e79
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -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

37
src/radeon_dri3.c
View File

@@ -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,

1
src/radeon_probe.h
View File

@@ -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);