aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov2015-05-30 08:25:08 -0500
committerEmil Velikov2015-06-29 05:12:21 -0500
commit5b0e76f143887c4ec7db45c54a7ba27a58f59227 (patch)
treee400f3b7878b59f590d81ca783e16904da189cb0 /xf86drm.h
parent203983f842a889b279698fdea46e83ee4450a1db (diff)
downloadexternal-libdrm-5b0e76f143887c4ec7db45c54a7ba27a58f59227.tar.gz
external-libdrm-5b0e76f143887c4ec7db45c54a7ba27a58f59227.tar.xz
external-libdrm-5b0e76f143887c4ec7db45c54a7ba27a58f59227.zip
Revert "Add device enumeration interface (v4)"
This reverts commit fde4969176822fe54197b6baa78f8b0ef900baba. The commit adds an API that does not seem flexible enough to be used in current open-source projects. Additionally it adds a hidden dependency of libudev, which when used in mesa caused grief when combined with Steam('s runtime). Let's revert this for now and add a tweaked API later on that can be used in mesa/xserver. Cc: Frank Min <frank.min@amd.com> Cc: Christian K├Ânig <christian.koenig@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Jammy Zhou <Jammy.Zhou@amd.com>
Diffstat (limited to 'xf86drm.h')
-rw-r--r--xf86drm.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/xf86drm.h b/xf86drm.h
index 2610934f..40c55c92 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -342,24 +342,6 @@ typedef struct _drmSetVersion {
342 int drm_dd_minor; 342 int drm_dd_minor;
343} drmSetVersion, *drmSetVersionPtr; 343} drmSetVersion, *drmSetVersionPtr;
344 344
345/**
346 * Structure to a general pci gpu device
347 *
348 * \sa drmGetDevices()
349 *
350*/
351typedef struct _drmPciDevice {
352 uint16_t domain;
353 uint8_t bus;
354 uint8_t dev;
355 uint8_t func;
356 uint16_t vendor_id;
357 uint16_t device_id;
358 uint16_t subvendor_id;
359 uint16_t subdevice_id;
360 uint8_t revision_id;
361} drmPciDevice, *drmPciDevicePtr;
362
363#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) 345#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
364 346
365#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ 347#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */
@@ -570,7 +552,6 @@ do { register unsigned int __old __asm("o0"); \
570/* General user-level programmer's API: unprivileged */ 552/* General user-level programmer's API: unprivileged */
571extern int drmAvailable(void); 553extern int drmAvailable(void);
572extern int drmOpen(const char *name, const char *busid); 554extern int drmOpen(const char *name, const char *busid);
573extern int drmGetPciDevices(drmPciDevicePtr devSet, uint16_t vendorId);
574 555
575#define DRM_NODE_PRIMARY 0 556#define DRM_NODE_PRIMARY 0
576#define DRM_NODE_CONTROL 1 557#define DRM_NODE_CONTROL 1