geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xf86drm: flex platform specifics into drmParsePciBusInfo 

This will allow one to reuse the core drmGetDevices implementation on
other platforms. Keeping all the platform specifics in ParseFoo.

On the plus side this saves a bit of code :)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
main
Emil Velikov 2015-09-07 12:37:57 +01:00
parent f098d1c130
commit 536e0deba3
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
xf86drm.c
View File

@ -2855,23 +2855,33 @@ static int drmParseSubsystemType(const char *str)
return -EINVAL; return -EINVAL;
} }
static int drmParsePciBusInfo(const char *str, drmPciBusInfoPtr info) static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
{ {
char path[PATH_MAX + 1];
char data[128];
char *str;
int domain, bus, dev, func; int domain, bus, dev, func;
char *value; int fd, ret;
snprintf(path, PATH_MAX, "/sys/dev/char/%d:%d/device/uevent", maj, min);
fd = open(path, O_RDONLY);
if (fd < 0)
return -errno;
ret = read(fd, data, sizeof(data));
close(fd);
if (ret < 0)
return -errno;
#define TAG "PCI_SLOT_NAME="
str = strstr(data, TAG);
if (str == NULL) if (str == NULL)
return -EINVAL; return -EINVAL;
value = strstr(str, "PCI_SLOT_NAME="); if (sscanf(str, TAG "%04x:%02x:%02x.%1u",
if (value == NULL)
return -EINVAL;
value += strlen("PCI_SLOT_NAME=");
if (sscanf(value, "%04x:%02x:%02x.%1u",
&domain, &bus, &dev, &func) != 4) &domain, &bus, &dev, &func) != 4)
return -EINVAL; return -EINVAL;
#undef TAG
info->domain = domain; info->domain = domain;
info->bus = bus; info->bus = bus;
@ -2981,7 +2991,6 @@ int drmGetDevices(drmDevicePtr devices[], int max_devices)
struct stat sbuf = {0}; struct stat sbuf = {0};
char node[PATH_MAX + 1] = ""; char node[PATH_MAX + 1] = "";
char path[PATH_MAX + 1] = ""; char path[PATH_MAX + 1] = "";
char data[128] = "";
unsigned char config[64] = ""; unsigned char config[64] = "";
int node_type, subsystem_type; int node_type, subsystem_type;
int maj, min; int maj, min;
@ -3030,22 +3039,7 @@ int drmGetDevices(drmDevicePtr devices[], int max_devices)
goto free_locals; goto free_locals;
} }
snprintf(path, PATH_MAX, "/sys/dev/char/%d:%d/device/uevent", ret = drmParsePciBusInfo(maj, min, pcibus);
maj, min);
fd = open(path, O_RDONLY);
if (fd < 0) {
ret = -errno;
goto free_locals;
}
ret = read(fd, data, sizeof(data));
if (ret < 0) {
ret = -errno;
close(fd);
goto free_locals;
}
ret = drmParsePciBusInfo(data, pcibus);
close(fd);
if (ret) if (ret)
goto free_locals; goto free_locals;