From c973e440d5b4057d93b4ce1298da77c3449c9f33 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 3 Apr 2014 16:22:26 +1100 Subject: [PATCH] egl/dri2: use drm macros to construct device name Don't hardcode /dev/dri/card0 but instead use the drm macros which allows the correct /dev/drm0 device to be opened on OpenBSD. v2: use snprintf and fallback to /dev/dri/card0 v3: check for snprintf truncation Signed-off-by: Jonathan Gray Cc: "10.1" Reviewed-by: Emil Velikov Reviewed-by: Matt Turner --- src/egl/drivers/dri2/platform_drm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 2f7edb9f277..9a7633a070a 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -492,7 +492,12 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) gbm = disp->PlatformDisplay; if (gbm == NULL) { - fd = open("/dev/dri/card0", O_RDWR); + char buf[64]; + int n = snprintf(buf, sizeof(buf), DRM_DEV_NAME, DRM_DIR_NAME, 0); + if (n != -1 && n < sizeof(buf)) + fd = open(buf, O_RDWR); + if (fd < 0) + fd = open("/dev/dri/card0", O_RDWR); dri2_dpy->own_device = 1; gbm = gbm_create_device(fd); if (gbm == NULL) -- 2.30.2