X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2Floader.c;h=182ba90a0da8c152b1791f9642384654bca66121;hb=11d688d9f0d2ee4d0178d1807c0075e5e8364b1d;hp=001c46d2a1b4dc7a5cc08a4cc901cdf9847a3d7b;hpb=1e2e625e306ea57575d5a89f7633e080ab045ec0;p=mesa.git diff --git a/src/loader/loader.c b/src/loader/loader.c index 001c46d2a1b..182ba90a0da 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -1,45 +1,7 @@ /* * 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 + * Copyright (C) 2014-2016 Emil Velikov + * Copyright (C) 2016 Intel Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -71,6 +33,8 @@ #include #include #include +#include +#include #ifdef MAJOR_IN_MKDEV #include #endif @@ -80,12 +44,10 @@ #include "loader.h" #ifdef HAVE_LIBDRM -#include -#include #include #ifdef USE_DRICONF -#include "xmlconfig.h" -#include "xmlpool.h" +#include "util/xmlconfig.h" +#include "util/xmlpool.h" #endif #endif @@ -183,7 +145,7 @@ static char *drm_get_id_path_tag_for_fd(int fd) drmDevicePtr device; char *tag; - if (drmGetDevice(fd, &device) != 0) + if (drmGetDevice2(fd, 0, &device) != 0) return NULL; tag = drm_construct_id_path_tag(device); @@ -191,7 +153,7 @@ static char *drm_get_id_path_tag_for_fd(int fd) return tag; } -int loader_get_user_preferred_fd(int default_fd, int *different_device) +int loader_get_user_preferred_fd(int default_fd, bool *different_device) { /* Arbitrary "maximum" value of drm devices. */ #define MAX_DRM_DEVICES 32 @@ -209,7 +171,7 @@ int loader_get_user_preferred_fd(int default_fd, int *different_device) #endif if (prime == NULL) { - *different_device = 0; + *different_device = false; return default_fd; } @@ -217,7 +179,7 @@ int loader_get_user_preferred_fd(int default_fd, int *different_device) if (default_tag == NULL) goto err; - num_devices = drmGetDevices(devices, MAX_DRM_DEVICES); + num_devices = drmGetDevices2(0, devices, MAX_DRM_DEVICES); if (num_devices < 0) goto err; @@ -268,21 +230,21 @@ int loader_get_user_preferred_fd(int default_fd, int *different_device) return fd; err: - *different_device = 0; + *different_device = false; free(default_tag); free(prime); return default_fd; } #else -int loader_get_user_preferred_fd(int default_fd, int *different_device) +int loader_get_user_preferred_fd(int default_fd, bool *different_device) { - *different_device = 0; + *different_device = false; return default_fd; } #endif -#if defined(HAVE_SYSFS) || defined(HAVE_LIBDRM) +#if defined(HAVE_LIBDRM) static int dev_node_from_fd(int fd, unsigned int *maj, unsigned int *min) { @@ -313,14 +275,14 @@ drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) drmDevicePtr device; int ret; - if (drmGetDevice(fd, &device) == 0) { + if (drmGetDevice2(fd, 0, &device) == 0) { if (device->bustype == DRM_BUS_PCI) { *vendor_id = device->deviceinfo.pci->vendor_id; *chip_id = device->deviceinfo.pci->device_id; ret = 1; } else { - log_(_LOADER_WARNING, "MESA-LOADER: device is not located on the PCI bus\n"); + log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n"); ret = 0; } drmFreeDevice(&device); @@ -346,47 +308,6 @@ loader_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) } -#if HAVE_SYSFS -static char * -sysfs_get_device_name_for_fd(int fd) -{ - char *device_name = NULL; - unsigned int maj, min; - FILE *f; - char buf[0x40]; - static const char match[9] = "\nDEVNAME="; - int expected = 1; - - if (dev_node_from_fd(fd, &maj, &min) < 0) - return NULL; - - snprintf(buf, sizeof(buf), "/sys/dev/char/%d:%d/uevent", maj, min); - if (!(f = fopen(buf, "r"))) - return NULL; - - while (expected < sizeof(match)) { - int c = getc(f); - - if (c == EOF) { - fclose(f); - return NULL; - } else if (c == match[expected] ) - expected++; - else - expected = 0; - } - - strcpy(buf, "/dev/"); - if (fgets(buf + 5, sizeof(buf) - 5, f)) { - buf[strcspn(buf, "\n")] = '\0'; - device_name = strdup(buf); - } - - fclose(f); - return device_name; -} -#endif - #if defined(HAVE_LIBDRM) static char * drm_get_device_name_for_fd(int fd) @@ -411,10 +332,6 @@ loader_get_device_name_for_fd(int fd) { char *result = NULL; -#if HAVE_SYSFS - if ((result = sysfs_get_device_name_for_fd(fd))) - return result; -#endif #if HAVE_LIBDRM if ((result = drm_get_device_name_for_fd(fd))) return result; @@ -423,13 +340,21 @@ loader_get_device_name_for_fd(int fd) } char * -loader_get_driver_for_fd(int fd, unsigned driver_types) +loader_get_driver_for_fd(int fd) { int vendor_id, chip_id, i, j; char *driver = NULL; - if (!driver_types) - driver_types = _LOADER_GALLIUM | _LOADER_DRI; + /* Allow an environment variable to force choosing a different driver + * binary. If that driver binary can't survive on this FD, that's the + * user's problem, but this allows vc4 simulator to run on an i965 host, + * and may be useful for some touch testing of i915 on an i965 host. + */ + if (geteuid() == getuid()) { + driver = getenv("MESA_LOADER_DRIVER_OVERRIDE"); + if (driver) + return strdup(driver); + } if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) { @@ -455,9 +380,6 @@ loader_get_driver_for_fd(int fd, unsigned driver_types) if (vendor_id != driver_map[i].vendor_id) continue; - if (!(driver_types & driver_map[i].driver_types)) - continue; - if (driver_map[i].predicate && !driver_map[i].predicate(fd)) continue; @@ -485,3 +407,28 @@ loader_set_logger(void (*logger)(int level, const char *fmt, ...)) { log_ = logger; } + +/* XXX: Local definition to avoid pulling the heavyweight GL/gl.h and + * GL/internal/dri_interface.h + */ + +#ifndef __DRI_DRIVER_GET_EXTENSIONS +#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions" +#endif + +char * +loader_get_extensions_name(const char *driver_name) +{ + char *name = NULL; + + if (asprintf(&name, "%s_%s", __DRI_DRIVER_GET_EXTENSIONS, driver_name) < 0) + return NULL; + + const size_t len = strlen(name); + for (size_t i = 0; i < len; i++) { + if (name[i] == '-') + name[i] = '_'; + } + + return name; +}