diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-02-20 05:47:48 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-02-20 05:47:48 +0000 |
| commit | 97c9585d2250d41503f4b492c6a66da80462aaad (patch) | |
| tree | 99a5c06bb7f67e28d2cc13592dc47ec6df9f8d56 | |
| parent | 32a5d7aa281e6635f11745c7c48b6db6d0a56ac3 (diff) | |
change from /dev/drm to /dev/dri/ in xenocara
ok matthieu@ kettenis@
| -rw-r--r-- | lib/libdrm/xf86drm.h | 7 | ||||
| -rw-r--r-- | xserver/hw/xfree86/drivers/modesetting/driver.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/libdrm/xf86drm.h b/lib/libdrm/xf86drm.h index 7b85079ad..65adeabb3 100644 --- a/lib/libdrm/xf86drm.h +++ b/lib/libdrm/xf86drm.h @@ -76,18 +76,11 @@ extern "C" { (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -#ifdef __OpenBSD__ -#define DRM_DIR_NAME "/dev" -#define DRM_PRIMARY_MINOR_NAME "drm" -#define DRM_CONTROL_MINOR_NAME "drmC" -#define DRM_RENDER_MINOR_NAME "drmR" -#else #define DRM_DIR_NAME "/dev/dri" #define DRM_PRIMARY_MINOR_NAME "card" #define DRM_CONTROL_MINOR_NAME "controlD" #define DRM_RENDER_MINOR_NAME "renderD" #define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ -#endif #define DRM_DEV_NAME "%s/" DRM_PRIMARY_MINOR_NAME "%d" #define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d" diff --git a/xserver/hw/xfree86/drivers/modesetting/driver.c b/xserver/hw/xfree86/drivers/modesetting/driver.c index f11f44d5e..18ede07bd 100644 --- a/xserver/hw/xfree86/drivers/modesetting/driver.c +++ b/xserver/hw/xfree86/drivers/modesetting/driver.c @@ -226,7 +226,7 @@ open_hw(const char *dev) else { dev = getenv("KMSDEVICE"); if ((NULL == dev) || ((fd = priv_open_device(dev)) == -1)) { - dev = "/dev/drm0"; + dev = "/dev/dri/card0"; fd = priv_open_device(dev); } } |