#ifdef HAVE_LIBDRM
#include <xf86drm.h>
+#define MAX_DRM_DEVICES 64
#ifdef USE_DRICONF
#include "util/xmlconfig.h"
-#include "util/xmlpool.h"
+#include "util/driconf.h"
#endif
#endif
}
driver = strndup(version->name, version->name_len);
+ log_(driver ? _LOADER_DEBUG : _LOADER_WARNING, "using driver %s for %d\n",
+ driver, fd);
drmFreeVersion(version);
return driver;
int
loader_open_render_node(const char *name)
{
- drmDevicePtr *devices, device;
- int err, render = -ENOENT, fd;
- unsigned int num, i;
+ drmDevicePtr devices[MAX_DRM_DEVICES], device;
+ int i, num_devices, fd = -1;
- err = drmGetDevices2(0, NULL, 0);
- if (err < 0)
- return err;
-
- num = err;
-
- devices = calloc(num, sizeof(*devices));
- if (!devices)
- return -ENOMEM;
-
- err = drmGetDevices2(0, devices, num);
- if (err < 0) {
- render = err;
- goto free;
- }
+ num_devices = drmGetDevices2(0, devices, MAX_DRM_DEVICES);
+ if (num_devices <= 0)
+ return -ENOENT;
- for (i = 0; i < num; i++) {
+ for (i = 0; i < num_devices; i++) {
device = devices[i];
if ((device->available_nodes & (1 << DRM_NODE_RENDER)) &&
}
drmFreeVersion(version);
- render = fd;
break;
}
}
+ drmFreeDevices(devices, num_devices);
- drmFreeDevices(devices, num);
+ if (i == num_devices)
+ return -ENOENT;
-free:
- free(devices);
- return render;
+ return fd;
}
#ifdef USE_DRICONF
driParseOptionInfo(&defaultInitOptions, __driConfigOptionsLoader);
driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
- "loader", kernel_driver, NULL, 0);
+ "loader", kernel_driver, NULL, 0, NULL, 0);
if (driCheckOption(&userInitOptions, "dri_driver", DRI_STRING)) {
char *opt = driQueryOptionstr(&userInitOptions, "dri_driver");
/* not an empty string */
driParseOptionInfo(&defaultInitOptions, __driConfigOptionsLoader);
driParseConfigFiles(&userInitOptions, &defaultInitOptions, 0,
- "loader", NULL, NULL, 0);
+ "loader", NULL, NULL, 0, NULL, 0);
if (driCheckOption(&userInitOptions, "device_id", DRI_STRING))
prime = strdup(driQueryOptionstr(&userInitOptions, "device_id"));
driDestroyOptionCache(&userInitOptions);
int loader_get_user_preferred_fd(int default_fd, bool *different_device)
{
-/* Arbitrary "maximum" value of drm devices. */
-#define MAX_DRM_DEVICES 32
const char *dri_prime = getenv("DRI_PRIME");
char *default_tag, *prime = NULL;
drmDevicePtr devices[MAX_DRM_DEVICES];
- int i, num_devices, fd;
- bool found = false;
+ int i, num_devices, fd = -1;
if (dri_prime)
prime = strdup(dri_prime);
goto err;
num_devices = drmGetDevices2(0, devices, MAX_DRM_DEVICES);
- if (num_devices < 0)
+ if (num_devices <= 0)
goto err;
- /* two format are supported:
- * "1": choose any other card than the card used by default.
- * id_path_tag: (for example "pci-0000_02_00_0") choose the card
- * with this id_path_tag.
- */
- if (!strcmp(prime,"1")) {
- /* Hmm... detection for 2-7 seems to be broken. Oh well ...
- * Pick the first render device that is not our own.
- */
- for (i = 0; i < num_devices; i++) {
- if (devices[i]->available_nodes & 1 << DRM_NODE_RENDER &&
- !drm_device_matches_tag(devices[i], default_tag)) {
+ for (i = 0; i < num_devices; i++) {
+ if (!(devices[i]->available_nodes & 1 << DRM_NODE_RENDER))
+ continue;
- found = true;
- break;
- }
+ /* two formats of DRI_PRIME are supported:
+ * "1": choose any other card than the card used by default.
+ * id_path_tag: (for example "pci-0000_02_00_0") choose the card
+ * with this id_path_tag.
+ */
+ if (!strcmp(prime,"1")) {
+ if (drm_device_matches_tag(devices[i], default_tag))
+ continue;
+ } else {
+ if (!drm_device_matches_tag(devices[i], prime))
+ continue;
}
- } else {
- for (i = 0; i < num_devices; i++) {
- if (devices[i]->available_nodes & 1 << DRM_NODE_RENDER &&
- drm_device_matches_tag(devices[i], prime)) {
- found = true;
- break;
- }
- }
+ fd = loader_open_device(devices[i]->nodes[DRM_NODE_RENDER]);
+ break;
}
+ drmFreeDevices(devices, num_devices);
- if (!found) {
- drmFreeDevices(devices, num_devices);
+ if (i == num_devices)
goto err;
- }
- fd = loader_open_device(devices[i]->nodes[DRM_NODE_RENDER]);
- drmFreeDevices(devices, num_devices);
if (fd < 0)
goto err;
drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id)
{
drmDevicePtr device;
- bool ret;
- 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 = true;
- }
- else {
- log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n");
- ret = false;
- }
- drmFreeDevice(&device);
- }
- else {
+ if (drmGetDevice2(fd, 0, &device) != 0) {
log_(_LOADER_WARNING, "MESA-LOADER: failed to retrieve device information\n");
- ret = false;
+ return false;
}
- return ret;
+ if (device->bustype != DRM_BUS_PCI) {
+ drmFreeDevice(&device);
+ log_(_LOADER_DEBUG, "MESA-LOADER: device is not located on the PCI bus\n");
+ return false;
+ }
+
+ *vendor_id = device->deviceinfo.pci->vendor_id;
+ *chip_id = device->deviceinfo.pci->device_id;
+ drmFreeDevice(&device);
+ return true;
}
#endif
return result;
}
-char *
-loader_get_driver_for_fd(int fd)
+static char *
+loader_get_pci_driver(int fd)
{
int vendor_id, chip_id, i, j;
char *driver = NULL;
- /* 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 defined(HAVE_LIBDRM) && defined(USE_DRICONF)
- driver = loader_get_dri_config_driver(fd);
- if (driver)
- return driver;
-#endif
-
- if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id)) {
- driver = loader_get_kernel_driver_name(fd);
- if (driver)
- log_(_LOADER_INFO, "using driver %s for %d\n", driver, fd);
- return driver;
- }
+ if (!loader_get_pci_id_for_fd(fd, &vendor_id, &chip_id))
+ return NULL;
for (i = 0; i < ARRAY_SIZE(driver_map); i++) {
if (vendor_id != driver_map[i].vendor_id)
return driver;
}
+char *
+loader_get_driver_for_fd(int fd)
+{
+ char *driver;
+
+ /* 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 defined(HAVE_LIBDRM) && defined(USE_DRICONF)
+ driver = loader_get_dri_config_driver(fd);
+ if (driver)
+ return driver;
+#endif
+
+ driver = loader_get_pci_driver(fd);
+ if (!driver)
+ driver = loader_get_kernel_driver_name(fd);
+
+ return driver;
+}
+
void
loader_set_logger(loader_logger *logger)
{
projects / mesa.git / blobdiff