diff options
| author | Jammy Zhou <Jammy.Zhou@amd.com> | 2015-11-20 17:03:05 +0800 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-11-20 17:44:55 +0900 |
| commit | ea558e645786b08d75307716036045170e97b43e (patch) | |
| tree | 96c53257df001e27177481e336e6dac183c03297 | |
| parent | 43c2dc1aab682d5b6ad49d24983d6382c4f305bb (diff) | |
Use render node for DRI3 if available
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/amdgpu_dri3.c | 37 | ||||
| -rw-r--r-- | src/amdgpu_probe.h | 1 |
3 files changed, 36 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a884882..fb07e89 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.46]) +PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.60]) PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu]) PKG_CHECK_MODULES(GBM, [gbm]) diff --git a/src/amdgpu_dri3.c b/src/amdgpu_dri3.c index 73a79ac..c4b40d0 100644 --- a/src/amdgpu_dri3.c +++ b/src/amdgpu_dri3.c @@ -39,9 +39,7 @@ #include <fcntl.h> #include <errno.h> - -static int -amdgpu_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out) +static int open_master_node(ScreenPtr screen, int *out) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); @@ -87,6 +85,36 @@ amdgpu_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out) return Success; } +static int open_render_node(ScreenPtr screen, int *out) +{ + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); + int fd; + + fd = open(pAMDGPUEnt->render_node, O_RDWR | O_CLOEXEC); + if (fd < 0) + return BadAlloc; + + *out = fd; + return Success; +} + +static int +amdgpu_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out) +{ + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); + int ret = BadAlloc; + + if (pAMDGPUEnt->render_node) + ret = open_render_node(screen, out); + + if (ret != Success) + ret = open_master_node(screen, out); + + return ret; +} + static PixmapPtr amdgpu_dri3_pixmap_from_fd(ScreenPtr screen, int fd, CARD16 width, @@ -173,6 +201,9 @@ Bool amdgpu_dri3_screen_init(ScreenPtr screen) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); + + pAMDGPUEnt->render_node = drmGetRenderDeviceNameFromFd(pAMDGPUEnt->fd); if (!dri3_screen_init(screen, &amdgpu_dri3_screen_info)) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, diff --git a/src/amdgpu_probe.h b/src/amdgpu_probe.h index 5194f4c..6edd4a1 100644 --- a/src/amdgpu_probe.h +++ b/src/amdgpu_probe.h @@ -86,6 +86,7 @@ typedef struct { int fd_wakeup_ref; unsigned int assigned_crtcs; struct xf86_platform_device *platform_dev; + char *render_node; } AMDGPUEntRec, *AMDGPUEntPtr; extern const OptionInfoRec *AMDGPUOptionsWeak(void); |