summaryrefslogtreecommitdiff
path: root/src/intel_device.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-09-07 08:42:26 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-09-07 08:42:26 +0100
commit0c697aee9b3767be7d1e04e4e4f9d304f23b188a (patch)
treec509ab88dcb1ce9a44b6a94641ffe985b6030f37 /src/intel_device.c
parentea30967245707ca4825de154e589a83dc605dae0 (diff)
Revert "sna: Add XMir support"
This reverts commit 42d94356f65972eb7fb8991234a4e9388c4c2031. Ordered-by: The Management.
Diffstat (limited to 'src/intel_device.c')
-rw-r--r--src/intel_device.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/src/intel_device.c b/src/intel_device.c
index 710348e9..b3926df9 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -144,34 +144,10 @@ static int fd_set_nonblock(int fd)
return fd;
}
-static int __intel_open_xmir(const struct pci_device *pci,
- char **path)
-{
- char id[20];
- int fd;
-
- snprintf(id, sizeof(id),
- "pci:%04x:%02x:%02x.%d",
- pci->domain, pci->bus, pci->dev, pci->func);
- fd = xmir_get_drm_fd(id);
- if (fd == -1)
- return -1;
-
- if (*path == NULL) /* XXX Fix Xmir - it knows both the fd and path */
- *path = drmGetDeviceNameFromFd(fd);
- if (*path == NULL)
- fd = -1;
-
- return fd;
-}
-
static int __intel_open_device(const struct pci_device *pci, char **path)
{
int fd;
- if (xorgMir)
- return __intel_open_xmir(pci, path);
-
if (*path == NULL) {
char id[20];
int ret;