xf86-video-amdgpu: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon Apr 30 14:05:54 UTC 2018
src/amdgpu_probe.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 103bd6f44cc5f1a6cd6cc9a5cb34d0419c4cece9
Author: Slava Grigorev <slava.grigorev at amd.com>
Date: Fri Apr 27 13:04:36 2018 -0400
Include xf86platformBus.h unconditionally
Compilation failed with XSERVER_PLATFORM_BUS undefined:
../../src/amdgpu_probe.c: In function ‘amdgpu_kernel_open_fd’:
../../src/amdgpu_probe.c:133:21: error: dereferencing pointer to incomplete type ‘struct xf86_platform_device’
dev = platform_dev->pdev;
^~
Signed-off-by: Slava Grigorev <slava.grigorev at amd.com>
[ Michel Dänzer:
* Fixed remaining preprocessor guards to work with xserver 1.13
* Touched up commit log ]
diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c
index 88f99c6..9eeb84d 100644
--- a/src/amdgpu_probe.c
+++ b/src/amdgpu_probe.c
@@ -54,9 +54,7 @@
#include <xf86_OSproc.h>
#endif
-#ifdef XSERVER_PLATFORM_BUS
#include <xf86platformBus.h>
-#endif
_X_EXPORT int gAMDGPUEntityIndex = -1;
@@ -120,7 +118,7 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn,
char *busid;
int fd;
-#ifdef XF86_PDEV_SERVER_FD
+#ifdef ODEV_ATTRIB_FD
if (platform_dev) {
fd = xf86_get_platform_device_int_attrib(platform_dev,
ODEV_ATTRIB_FD, -1);
@@ -154,7 +152,7 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn,
void amdgpu_kernel_close_fd(AMDGPUEntPtr pAMDGPUEnt)
{
-#ifdef XF86_PDEV_SERVER_FD
+#if defined(XSERVER_PLATFORM_BUS) && defined(XF86_PDEV_SERVER_FD)
if (!(pAMDGPUEnt->platform_dev &&
pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
#endif
More information about the xorg-commit
mailing list