From 5b0e76f143887c4ec7db45c54a7ba27a58f59227 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 30 May 2015 14:25:08 +0100 Subject: Revert "Add device enumeration interface (v4)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Christian König Cc: Alex Deucher Cc: Jammy Zhou --- xf86drm.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'xf86drm.h') 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 { int drm_dd_minor; } drmSetVersion, *drmSetVersionPtr; -/** - * Structure to a general pci gpu device - * - * \sa drmGetDevices() - * -*/ -typedef struct _drmPciDevice { - uint16_t domain; - uint8_t bus; - uint8_t dev; - uint8_t func; - uint16_t vendor_id; - uint16_t device_id; - uint16_t subvendor_id; - uint16_t subdevice_id; - uint8_t revision_id; -} drmPciDevice, *drmPciDevicePtr; - #define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) #define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ @@ -570,7 +552,6 @@ do { register unsigned int __old __asm("o0"); \ /* General user-level programmer's API: unprivileged */ extern int drmAvailable(void); extern int drmOpen(const char *name, const char *busid); -extern int drmGetPciDevices(drmPciDevicePtr devSet, uint16_t vendorId); #define DRM_NODE_PRIMARY 0 #define DRM_NODE_CONTROL 1 -- cgit v1.2.3