From 4f12e5d53c8a349320883b093c19d91874f9f46a Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 19 Jan 2014 14:11:48 +0100 Subject: fontconfig mesa git update 19 Jan 2013 fontconfig commit 5918d5bea5416cf27061db4263aefeb8fd310f0e mesa commit a33d1339d5bfb32377be92957a493f0e3d84b31e --- mesalib/src/loader/Android.mk | 48 ++++++ mesalib/src/loader/Makefile.am | 37 +++++ mesalib/src/loader/Makefile.sources | 2 + mesalib/src/loader/SConscript | 27 +++ mesalib/src/loader/loader.c | 316 ++++++++++++++++++++++++++++++++++++ mesalib/src/loader/loader.h | 57 +++++++ 6 files changed, 487 insertions(+) create mode 100644 mesalib/src/loader/Android.mk create mode 100644 mesalib/src/loader/Makefile.am create mode 100644 mesalib/src/loader/Makefile.sources create mode 100644 mesalib/src/loader/SConscript create mode 100644 mesalib/src/loader/loader.c create mode 100644 mesalib/src/loader/loader.h (limited to 'mesalib/src/loader') diff --git a/mesalib/src/loader/Android.mk b/mesalib/src/loader/Android.mk new file mode 100644 index 000000000..01699dcc5 --- /dev/null +++ b/mesalib/src/loader/Android.mk @@ -0,0 +1,48 @@ +# Mesa 3-D graphics library +# +# Copyright (C) 2014 Emil Velikov +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/Makefile.sources + +# --------------------------------------- +# Build libloader +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(LOADER_C_FILES) + +# swrast only +ifeq ($(MESA_GPU_DRIVERS),swrast) + LOCAL_CFLAGS += -D_EGL_NO_DRM +else +LOCAL_C_INCLUDES += \ + $(DRM_TOP)/include/drm \ + $(DRM_TOP) +endif + +LOCAL_MODULE := libloader + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/mesalib/src/loader/Makefile.am b/mesalib/src/loader/Makefile.am new file mode 100644 index 000000000..a118fef1d --- /dev/null +++ b/mesalib/src/loader/Makefile.am @@ -0,0 +1,37 @@ +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +include Makefile.sources + +noinst_LTLIBRARIES = libloader.la + +libloader_la_CPPFLAGS = \ + $(DEFINES) \ + -I$(top_srcdir)/include \ + $(VISIBILITY_CFLAGS) \ + $(LIBDRM_CFLAGS) \ + $(LIBUDEV_CFLAGS) + +libloader_la_LIBADD = \ + $(LIBDRM_LIBS) \ + $(LIBUDEV_LIBS) + +libloader_la_SOURCES = $(LOADER_C_FILES) diff --git a/mesalib/src/loader/Makefile.sources b/mesalib/src/loader/Makefile.sources new file mode 100644 index 000000000..51a64ea6a --- /dev/null +++ b/mesalib/src/loader/Makefile.sources @@ -0,0 +1,2 @@ +LOADER_C_FILES := \ + loader.c \ No newline at end of file diff --git a/mesalib/src/loader/SConscript b/mesalib/src/loader/SConscript new file mode 100644 index 000000000..76b087100 --- /dev/null +++ b/mesalib/src/loader/SConscript @@ -0,0 +1,27 @@ +Import('*') + +if not env['drm']: + Return() + +env = env.Clone() + +env.Prepend(CPPPATH = [ + '#include' +]) + +env.PkgUseModules('DRM') + +if env['udev']: + env.PkgUseModules('UDEV') + env.Append(CPPDEFINES = ['HAVE_LIBUDEV']) + +# parse Makefile.sources +sources = env.ParseSourceList('Makefile.sources', 'LOADER_C_FILES') + +libloader = env.ConvenienceLibrary( + target = 'libloader', + source = sources, +) + +env.Alias('libloader', libloader) +Export('libloader') diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c new file mode 100644 index 000000000..108e44402 --- /dev/null +++ b/mesalib/src/loader/loader.c @@ -0,0 +1,316 @@ +/* + * Copyright (C) 2013 Rob Clark + * + * This code is derived from the following files. + * + * * src/glx/dri3_common.c + * Copyright © 2013 Keith Packard + * + * * src/egl/drivers/dri2/common.c + * * src/gbm/backends/dri/driver_name.c + * Copyright © 2011 Intel Corporation + * + * Authors: + * Kristian Høgsberg + * Benjamin Franzke + * + * * src/gallium/targets/egl-static/egl.c + * Copyright (C) 2010-2011 LunarG Inc. + * + * Authors: + * Chia-I Wu + * + * * src/gallium/state_trackers/egl/drm/native_drm.c + * Copyright (C) 2010 Chia-I Wu + * + * * src/egl/drivers/dri2/platform_android.c + * + * Copyright (C) 2010-2011 Chia-I Wu + * Copyright (C) 2010-2011 LunarG Inc. + * + * Based on platform_x11, which has + * + * Copyright © 2011 Intel Corporation + * + * * src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c + * Copyright 2011 Intel Corporation + * Copyright 2012 Francisco Jerez + * All Rights Reserved. + * + * Authors: + * Kristian Høgsberg + * Benjamin Franzke + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Authors: + * Rob Clark + */ + +#include +#include +#include +#include "loader.h" + +#include + +#define __IS_LOADER +#include "pci_ids/pci_id_driver_map.h" + +static void default_logger(int level, const char *fmt, ...) +{ + if (level >= _LOADER_WARNING) { + va_list args; + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); + fprintf(stderr, "\n"); + } +} + +static void (*log)(int level, const char *fmt, ...) = default_logger; + +#ifdef HAVE_LIBUDEV +#include + +static inline struct udev_device * +udev_device_new_from_fd(struct udev *udev, int fd) +{ + struct udev_device *device; + struct stat buf; + + if (fstat(fd, &buf) < 0) { + log(_LOADER_WARNING, "MESA-LOADER: failed to stat fd %d", fd); + return NULL; + } + + device = udev_device_new_from_devnum(udev, 'c', buf.st_rdev); + if (device == NULL) { + log(_LOADER_WARNING, + "MESA-LOADER: could not create udev device for fd %d", fd); + return NULL; + } + + return device; +} + +int +loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) +{ + struct udev *udev = NULL; + struct udev_device *device = NULL, *parent; + struct stat buf; + const char *pci_id; + + *chip_id = -1; + + udev = udev_new(); + device = udev_device_new_from_fd(udev, fd); + if (!device) + goto out; + + parent = udev_device_get_parent(device); + if (parent == NULL) { + log(_LOADER_WARNING, "MESA-LOADER: could not get parent device"); + goto out; + } + + pci_id = udev_device_get_property_value(parent, "PCI_ID"); + if (pci_id == NULL || + sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) { + log(_LOADER_WARNING, "MESA-LOADER: malformed or no PCI ID"); + *chip_id = -1; + goto out; + } + +out: + if (device) + udev_device_unref(device); + if (udev) + udev_unref(udev); + + return (*chip_id >= 0); +} + +#elif defined(ANDROID) && !defined(_EGL_NO_DRM) + +/* for i915 */ +#include +/* for radeon */ +#include + +int +loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) +{ + drmVersionPtr version; + + *chip_id = -1; + + version = drmGetVersion(fd); + if (!version) { + log(_LOADER_WARNING, "MESA-LOADER: invalid drm fd"); + return FALSE; + } + if (!version->name) { + log(_LOADER_WARNING, "MESA-LOADER: unable to determine the driver name"); + drmFreeVersion(version); + return FALSE; + } + + if (strcmp(version->name, "i915") == 0) { + struct drm_i915_getparam gp; + int ret; + + *vendor_id = 0x8086; + + memset(&gp, 0, sizeof(gp)); + gp.param = I915_PARAM_CHIPSET_ID; + gp.value = chip_id; + ret = drmCommandWriteRead(fd, DRM_I915_GETPARAM, &gp, sizeof(gp)); + if (ret) { + log(_LOADER_WARNING, "MESA-LOADER: failed to get param for i915"); + *chip_id = -1; + } + } + else if (strcmp(version->name, "radeon") == 0) { + struct drm_radeon_info info; + int ret; + + *vendor_id = 0x1002; + + memset(&info, 0, sizeof(info)); + info.request = RADEON_INFO_DEVICE_ID; + info.value = (unsigned long) chip_id; + ret = drmCommandWriteRead(fd, DRM_RADEON_INFO, &info, sizeof(info)); + if (ret) { + log(_LOADER_WARNING, "MESA-LOADER: failed to get info for radeon"); + *chip_id = -1; + } + } + else if (strcmp(version->name, "nouveau") == 0) { + *vendor_id = 0x10de; + /* not used */ + *chip_id = 0; + } + else if (strcmp(version->name, "vmwgfx") == 0) { + *vendor_id = 0x15ad; + /* assume SVGA II */ + *chip_id = 0x0405; + } + + drmFreeVersion(version); + + return (*chip_id >= 0); +} + +#else + +int +loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) +{ + return 0; +} + +#endif + + +char * +loader_get_device_name_for_fd(int fd) +{ + char *device_name = NULL; +#ifdef HAVE_LIBUDEV + struct udev *udev; + struct udev_device *device; + const char *const_device_name; + + udev = udev_new(); + device = udev_device_new_from_fd(udev, fd); + if (device == NULL) + return NULL; + + const_device_name = udev_device_get_devnode(device); + if (!const_device_name) + goto out; + device_name = strdup(const_device_name); + +out: + udev_device_unref(device); + udev_unref(udev); +#endif + return device_name; +} + +char * +loader_get_driver_for_fd(int fd, unsigned driver_types) +{ + int vendor_id, chip_id, i, j; + char *driver = NULL; + + if (!driver_types) + driver_types = _LOADER_GALLIUM | _LOADER_DRI; + + if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) { + /* fallback to drmGetVersion(): */ + drmVersionPtr version = drmGetVersion(fd); + + if (!version) { + log(_LOADER_WARNING, "failed to get driver name for fd %d", fd); + return NULL; + } + + driver = strndup(version->name, version->name_len); + log(_LOADER_INFO, "using driver %s for %d", driver, fd); + + drmFreeVersion(version); + + return driver; + } + + for (i = 0; driver_map[i].driver; i++) { + if (vendor_id != driver_map[i].vendor_id) + continue; + + if (!(driver_types & driver_map[i].driver_types)) + continue; + + if (driver_map[i].num_chips_ids == -1) { + driver = strdup(driver_map[i].driver); + goto out; + } + + for (j = 0; j < driver_map[i].num_chips_ids; j++) + if (driver_map[i].chip_ids[j] == chip_id) { + driver = strdup(driver_map[i].driver); + goto out; + } + } + +out: + log(driver ? _LOADER_INFO : _LOADER_WARNING, + "pci id for fd %d: %04x:%04x, driver %s", + fd, vendor_id, chip_id, driver); + return driver; +} + +void +loader_set_logger(void (*logger)(int level, const char *fmt, ...)) +{ + log = logger; +} diff --git a/mesalib/src/loader/loader.h b/mesalib/src/loader/loader.h new file mode 100644 index 000000000..dfd77baad --- /dev/null +++ b/mesalib/src/loader/loader.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2013 Rob Clark + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Authors: + * Rob Clark + */ + +#ifndef LOADER_H +#define LOADER_H + +/* Helpers to figure out driver and device name, eg. from pci-id, etc. */ + +#define _LOADER_DRI (1 << 0) +#define _LOADER_GALLIUM (1 << 1) + +int +loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id); + +char * +loader_get_driver_for_fd(int fd, unsigned driver_types); + +char * +loader_get_device_name_for_fd(int fd); + + +/* for logging.. keep this aligned with egllog.h so we can just use + * _eglLog directly. + */ + +#define _LOADER_FATAL 0 /* unrecoverable error */ +#define _LOADER_WARNING 1 /* recoverable error/problem */ +#define _LOADER_INFO 2 /* just useful info */ +#define _LOADER_DEBUG 3 /* useful info for debugging */ + +void +loader_set_logger(void (*logger)(int level, const char *fmt, ...)); + +#endif /* LOADER_H */ -- cgit v1.2.3 From 775780ea274e6602c2d64de33a98ee35979cc330 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 20 Jan 2014 17:37:27 +0100 Subject: ligXext mesa git update 20 Jan 2014 libXext commit d5447c0156f556114dbf97d6064c0c7b0fcd5f70 mesa commit 799abb271a248f646faa5cc859968f8c71e1ef16 --- mesalib/src/loader/Android.mk | 2 +- mesalib/src/loader/Makefile.am | 13 +++++++++++-- mesalib/src/loader/SConscript | 5 +---- mesalib/src/loader/loader.c | 34 +++++++++++++++++++--------------- 4 files changed, 32 insertions(+), 22 deletions(-) (limited to 'mesalib/src/loader') diff --git a/mesalib/src/loader/Android.mk b/mesalib/src/loader/Android.mk index 01699dcc5..6890af473 100644 --- a/mesalib/src/loader/Android.mk +++ b/mesalib/src/loader/Android.mk @@ -35,7 +35,7 @@ LOCAL_SRC_FILES := \ # swrast only ifeq ($(MESA_GPU_DRIVERS),swrast) - LOCAL_CFLAGS += -D_EGL_NO_DRM + LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H else LOCAL_C_INCLUDES += \ $(DRM_TOP)/include/drm \ diff --git a/mesalib/src/loader/Makefile.am b/mesalib/src/loader/Makefile.am index a118fef1d..371dd575c 100644 --- a/mesalib/src/loader/Makefile.am +++ b/mesalib/src/loader/Makefile.am @@ -27,11 +27,20 @@ libloader_la_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ $(VISIBILITY_CFLAGS) \ - $(LIBDRM_CFLAGS) \ $(LIBUDEV_CFLAGS) libloader_la_LIBADD = \ - $(LIBDRM_LIBS) \ $(LIBUDEV_LIBS) +if !HAVE_LIBDRM +libloader_la_CPPFLAGS += \ + -D__NOT_HAVE_DRM_H +else +libloader_la_CPPFLAGS += \ + $(LIBDRM_CFLAGS) + +libloader_la_LIBADD += \ + $(LIBDRM_LIBS) +endif + libloader_la_SOURCES = $(LOADER_C_FILES) diff --git a/mesalib/src/loader/SConscript b/mesalib/src/loader/SConscript index 76b087100..359fc1850 100644 --- a/mesalib/src/loader/SConscript +++ b/mesalib/src/loader/SConscript @@ -1,15 +1,12 @@ Import('*') -if not env['drm']: - Return() - env = env.Clone() env.Prepend(CPPPATH = [ '#include' ]) -env.PkgUseModules('DRM') +env.Append(CPPDEFINES = ['__NOT_HAVE_DRM_H']) if env['udev']: env.PkgUseModules('UDEV') diff --git a/mesalib/src/loader/loader.c b/mesalib/src/loader/loader.c index 108e44402..a5bd7692e 100644 --- a/mesalib/src/loader/loader.c +++ b/mesalib/src/loader/loader.c @@ -69,7 +69,9 @@ #include #include "loader.h" +#ifndef __NOT_HAVE_DRM_H #include +#endif #define __IS_LOADER #include "pci_ids/pci_id_driver_map.h" @@ -85,7 +87,7 @@ static void default_logger(int level, const char *fmt, ...) } } -static void (*log)(int level, const char *fmt, ...) = default_logger; +static void (*log_)(int level, const char *fmt, ...) = default_logger; #ifdef HAVE_LIBUDEV #include @@ -97,13 +99,13 @@ udev_device_new_from_fd(struct udev *udev, int fd) struct stat buf; if (fstat(fd, &buf) < 0) { - log(_LOADER_WARNING, "MESA-LOADER: failed to stat fd %d", fd); + log_(_LOADER_WARNING, "MESA-LOADER: failed to stat fd %d", fd); return NULL; } device = udev_device_new_from_devnum(udev, 'c', buf.st_rdev); if (device == NULL) { - log(_LOADER_WARNING, + log_(_LOADER_WARNING, "MESA-LOADER: could not create udev device for fd %d", fd); return NULL; } @@ -116,7 +118,6 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) { struct udev *udev = NULL; struct udev_device *device = NULL, *parent; - struct stat buf; const char *pci_id; *chip_id = -1; @@ -128,14 +129,14 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) parent = udev_device_get_parent(device); if (parent == NULL) { - log(_LOADER_WARNING, "MESA-LOADER: could not get parent device"); + log_(_LOADER_WARNING, "MESA-LOADER: could not get parent device"); goto out; } pci_id = udev_device_get_property_value(parent, "PCI_ID"); if (pci_id == NULL || sscanf(pci_id, "%x:%x", vendor_id, chip_id) != 2) { - log(_LOADER_WARNING, "MESA-LOADER: malformed or no PCI ID"); + log_(_LOADER_WARNING, "MESA-LOADER: malformed or no PCI ID"); *chip_id = -1; goto out; } @@ -149,7 +150,7 @@ out: return (*chip_id >= 0); } -#elif defined(ANDROID) && !defined(_EGL_NO_DRM) +#elif defined(ANDROID) && !defined(__NOT_HAVE_DRM_H) /* for i915 */ #include @@ -165,11 +166,11 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) version = drmGetVersion(fd); if (!version) { - log(_LOADER_WARNING, "MESA-LOADER: invalid drm fd"); + log_(_LOADER_WARNING, "MESA-LOADER: invalid drm fd"); return FALSE; } if (!version->name) { - log(_LOADER_WARNING, "MESA-LOADER: unable to determine the driver name"); + log_(_LOADER_WARNING, "MESA-LOADER: unable to determine the driver name"); drmFreeVersion(version); return FALSE; } @@ -185,7 +186,7 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) gp.value = chip_id; ret = drmCommandWriteRead(fd, DRM_I915_GETPARAM, &gp, sizeof(gp)); if (ret) { - log(_LOADER_WARNING, "MESA-LOADER: failed to get param for i915"); + log_(_LOADER_WARNING, "MESA-LOADER: failed to get param for i915"); *chip_id = -1; } } @@ -200,7 +201,7 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) info.value = (unsigned long) chip_id; ret = drmCommandWriteRead(fd, DRM_RADEON_INFO, &info, sizeof(info)); if (ret) { - log(_LOADER_WARNING, "MESA-LOADER: failed to get info for radeon"); + log_(_LOADER_WARNING, "MESA-LOADER: failed to get info for radeon"); *chip_id = -1; } } @@ -267,18 +268,21 @@ loader_get_driver_for_fd(int fd, unsigned driver_types) driver_types = _LOADER_GALLIUM | _LOADER_DRI; if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) { + +#ifndef __NOT_HAVE_DRM_H /* fallback to drmGetVersion(): */ drmVersionPtr version = drmGetVersion(fd); if (!version) { - log(_LOADER_WARNING, "failed to get driver name for fd %d", fd); + log_(_LOADER_WARNING, "failed to get driver name for fd %d", fd); return NULL; } driver = strndup(version->name, version->name_len); - log(_LOADER_INFO, "using driver %s for %d", driver, fd); + log_(_LOADER_INFO, "using driver %s for %d", driver, fd); drmFreeVersion(version); +#endif return driver; } @@ -303,7 +307,7 @@ loader_get_driver_for_fd(int fd, unsigned driver_types) } out: - log(driver ? _LOADER_INFO : _LOADER_WARNING, + log_(driver ? _LOADER_INFO : _LOADER_WARNING, "pci id for fd %d: %04x:%04x, driver %s", fd, vendor_id, chip_id, driver); return driver; @@ -312,5 +316,5 @@ out: void loader_set_logger(void (*logger)(int level, const char *fmt, ...)) { - log = logger; + log_ = logger; } -- cgit v1.2.3