xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Thu Mar 15 18:26:25 UTC 2018
hw/xfree86/drivers/modesetting/driver.c | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit 7fc89251ef5e7363dfbf6d831ed448bbcd8519b8
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Mar 4 13:00:05 2018 -0800
Revert "modesetting: Remove #ifdefs XF86_PDEV_SERVER_FD"
This reverts commit 8c455db0ebb6e5313ca81428bb6dd75ef12aaa15.
Since xf86platformBus.h is only included when XSERVER_PLATFORM_BUS is
defined, and configure.ac only defines that on systems with udev, this
commit breaks the build on non-udev systems like Solaris.
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index f20284bb0..af1d6b6e8 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -244,12 +244,14 @@ probe_hw(const char *dev, struct xf86_platform_device *platform_dev)
{
int fd;
+#ifdef XF86_PDEV_SERVER_FD
if (platform_dev && (platform_dev->flags & XF86_PDEV_SERVER_FD)) {
fd = xf86_platform_device_odev_attributes(platform_dev)->fd;
if (fd == -1)
return FALSE;
return check_outputs(fd, NULL);
}
+#endif
fd = open_hw(dev);
if (fd != -1) {
@@ -710,8 +712,10 @@ FreeRec(ScrnInfoPtr pScrn)
if (ms->pEnt->location.type == BUS_PCI)
ret = drmClose(ms->fd);
else
+#ifdef XF86_PDEV_SERVER_FD
if (!(ms->pEnt->location.type == BUS_PLATFORM &&
(ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)))
+#endif
ret = close(ms->fd);
(void) ret;
ms_ent->fd = 0;
@@ -824,11 +828,13 @@ ms_get_drm_master_fd(ScrnInfoPtr pScrn)
#ifdef XSERVER_PLATFORM_BUS
if (pEnt->location.type == BUS_PLATFORM) {
+#ifdef XF86_PDEV_SERVER_FD
if (pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)
ms->fd =
xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
fd;
else
+#endif
{
char *path =
xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
@@ -1497,9 +1503,11 @@ SetMaster(ScrnInfoPtr pScrn)
modesettingPtr ms = modesettingPTR(pScrn);
int ret;
+#ifdef XF86_PDEV_SERVER_FD
if (ms->pEnt->location.type == BUS_PLATFORM &&
(ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))
return TRUE;
+#endif
ret = drmSetMaster(ms->fd);
if (ret)
@@ -1744,9 +1752,11 @@ LeaveVT(ScrnInfoPtr pScrn)
pScrn->vtSema = FALSE;
+#ifdef XF86_PDEV_SERVER_FD
if (ms->pEnt->location.type == BUS_PLATFORM &&
(ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))
return;
+#endif
drmDropMaster(ms->fd);
}
More information about the xorg-commit
mailing list