Page MenuHomeFreeBSD

D9624.diff
No OneTemporary

D9624.diff

Index: head/graphics/libdrm/Makefile
===================================================================
--- head/graphics/libdrm/Makefile
+++ head/graphics/libdrm/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libdrm
PORTVERSION= 2.4.75
PORTEPOCH= 1
+PORTREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= http://dri.freedesktop.org/libdrm/
Index: head/graphics/libdrm/files/patch-xf86drmMode.c
===================================================================
--- head/graphics/libdrm/files/patch-xf86drmMode.c
+++ head/graphics/libdrm/files/patch-xf86drmMode.c
@@ -1,54 +0,0 @@
-Disable checking for hw.dri.%d.modesetting.
-This sysctl is only available if a KMS module is loaded. But the libdrm
-check happens before X got a chance of loading the KMS module.
-
---- xf86drmMode.c.orig 2017-01-28 01:15:16 UTC
-+++ xf86drmMode.c
-@@ -47,6 +47,7 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>
- #ifdef HAVE_SYS_SYSCTL_H
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
- #include <stdio.h>
-@@ -797,38 +798,7 @@ int drmCheckModesettingSupported(const c
- if (found)
- return 0;
- #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
-- char kbusid[1024], sbusid[1024];
-- char oid[128];
-- int domain, bus, dev, func;
-- int i, modesetting, ret;
-- size_t len;
--
-- ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev,
-- &func);
-- if (ret != 4)
-- return -EINVAL;
-- snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus,
-- dev, func);
--
-- /* How many GPUs do we expect in the machine ? */
-- for (i = 0; i < 16; i++) {
-- snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i);
-- len = sizeof(sbusid);
-- ret = sysctlbyname(oid, sbusid, &len, NULL, 0);
-- if (ret == -1) {
-- if (errno == ENOENT)
-- continue;
-- return -EINVAL;
-- }
-- if (strcmp(sbusid, kbusid) != 0)
-- continue;
-- snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i);
-- len = sizeof(modesetting);
-- ret = sysctlbyname(oid, &modesetting, &len, NULL, 0);
-- if (ret == -1 || len != sizeof(modesetting))
-- return -EINVAL;
-- return (modesetting ? 0 : -ENOSYS);
-- }
-+ return 0;
- #elif defined(__DragonFly__)
- return 0;
- #endif

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 14, 1:01 PM (15 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29670540
Default Alt Text
D9624.diff (2 KB)

Event Timeline