frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Move DRICreatePCIBusID to the PCI code 

This symbol is used by some DRI2+ drivers and there's nothing
DRI1-specific about it.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2017-06-16 15:44:44 -04:00
parent b723da8390
commit fbc4da6fef
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/common/xf86pciBus.c
View File

@ -1465,3 +1465,15 @@ xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
if (*chipset < 0) if (*chipset < 0)
*chipset = (pVideo->vendor_id << 16) | pVideo->device_id; *chipset = (pVideo->vendor_id << 16) | pVideo->device_id;
} }
char *
DRICreatePCIBusID(const struct pci_device *dev)
{
char *busID;
if (asprintf(&busID, "pci:%04x:%02x:%02x.%d",
dev->domain, dev->bus, dev->dev, dev->func) == -1)
return NULL;
return busID;
}

2
hw/xfree86/common/xf86str.h
View File

@ -771,4 +771,6 @@ typedef enum {
ACTION_SWITCHSCREEN_PREV, ACTION_SWITCHSCREEN_PREV,
} ActionEvent; } ActionEvent;
extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *dev);
#endif /* _XF86STR_H */ #endif /* _XF86STR_H */

12
hw/xfree86/dri/dri.c
View File

@ -2404,15 +2404,3 @@ DRIMoveBuffersHelper(ScreenPtr pScreen,
*xdir = 1; *xdir = 1;
} }
char *
DRICreatePCIBusID(const struct pci_device *dev)
{
char *busID;
if (asprintf(&busID, "pci:%04x:%02x:%02x.%d",
dev->domain, dev->bus, dev->dev, dev->func) == -1)
return NULL;
return busID;
}

2
hw/xfree86/dri/dri.h
View File

@ -325,8 +325,6 @@ extern _X_EXPORT void DRIMoveBuffersHelper(ScreenPtr pScreen,
int dy, int dy,
int *xdir, int *ydir, RegionPtr reg); int *xdir, int *ydir, RegionPtr reg);
extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *PciInfo);
extern _X_EXPORT int DRIMasterFD(ScrnInfoPtr pScrn); extern _X_EXPORT int DRIMasterFD(ScrnInfoPtr pScrn);
extern _X_EXPORT void *DRIMasterSareaPointer(ScrnInfoPtr pScrn); extern _X_EXPORT void *DRIMasterSareaPointer(ScrnInfoPtr pScrn);