diff options
| author | Jammy Zhou <Jammy.Zhou@amd.com> | 2016-02-16 16:36:33 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel.daenzer@amd.com> | 2016-02-16 16:36:33 +0900 |
| commit | cd94248ffa7d8fe0b57476f79e7e860dee66d1b0 (patch) | |
| tree | 2600d81e335fb53d48b88baa210a3fd7022bebff | |
| parent | d41fcccf2f11d0393d252e76bbbe6d233c4ac443 (diff) | |
Use render node for DRI3 if available
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
(ported from amdgpu commit ea558e645786b08d75307716036045170e97b43e)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/radeon_dri3.c | 37 | ||||
| -rw-r--r-- | src/radeon_probe.h | 1 |
3 files changed, 36 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 0a95420b..f2bf57c6 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.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 1415a0df..de97f396 100644 --- a/src/radeon_dri3.c +++ b/src/radeon_dri3.c @@ -39,9 +39,7 @@ #include <fcntl.h> #include <errno.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); @@ -86,6 +84,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; +} + static PixmapPtr radeon_dri3_pixmap_from_fd(ScreenPtr screen, int fd, CARD16 width, @@ -190,6 +218,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 258c7be1..36e2ff65 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -142,6 +142,7 @@ typedef struct #ifdef XSERVER_PLATFORM_BUS struct xf86_platform_device *platform_dev; #endif + char *render_node; } RADEONEntRec, *RADEONEntPtr; extern const OptionInfoRec *RADEONOptionsWeak(void); |