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

xf86drm: introduce a get_real_pci_path() helper 

Introduce a helper which gets the real sysfs path for the given pci
device.

In other words, instead opening the /sys/dev/char/*/device symlink, we
opt for the actual /sys/devices/pci*/*/

It folds three (nearly identical) snprintf's and paves the way of adding
extra devices (see next patch) a piece of pie.

v2: use a caller (on stack) provided real_path (Eric)

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Tested-by: Robert Foss <robert.foss@collabora.com> (v1)
Reviewed-by: Robert Foss <robert.foss@collabora.com> (v1)
Reviewed-by: Eric Engestrom <eric@engestrom.ch> (v1)
main
Emil Velikov 2018-05-15 17:29:44 +01:00 committed by Emil Velikov
parent 95b262f019
commit a02900133b
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xf86drm.c
View File

@ -2992,16 +2992,29 @@ static int drmParseSubsystemType(int maj, int min)
#endif #endif
} }
static char *
get_real_pci_path(int maj, int min, char *real_path)
{
char path[PATH_MAX + 1];
snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min);
if (!realpath(path, real_path))
return NULL;
return real_path;
}
static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info) static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
{ {
#ifdef __linux__ #ifdef __linux__
unsigned int domain, bus, dev, func; unsigned int domain, bus, dev, func;
char path[PATH_MAX + 1], *value; char real_path[PATH_MAX + 1], *value;
int num; int num;
snprintf(path, sizeof(path), "/sys/dev/char/%d:%d/device", maj, min); if (get_real_pci_path(maj, min, real_path) == NULL)
return -ENOENT;
value = sysfs_uevent_get(path, "PCI_SLOT_NAME"); value = sysfs_uevent_get(real_path, "PCI_SLOT_NAME");
if (!value) if (!value)
return -ENOENT; return -ENOENT;
@ -3114,14 +3127,16 @@ static int parse_separate_sysfs_files(int maj, int min,
"subsystem_vendor", "subsystem_vendor",
"subsystem_device", "subsystem_device",
}; };
char path[PATH_MAX + 1]; char path[PATH_MAX + 1], real_path[PATH_MAX + 1];
unsigned int data[ARRAY_SIZE(attrs)]; unsigned int data[ARRAY_SIZE(attrs)];
FILE *fp; FILE *fp;
int ret; int ret;
if (get_real_pci_path(maj, min, real_path) == NULL)
return -ENOENT;
for (unsigned i = ignore_revision ? 1 : 0; i < ARRAY_SIZE(attrs); i++) { for (unsigned i = ignore_revision ? 1 : 0; i < ARRAY_SIZE(attrs); i++) {
snprintf(path, PATH_MAX, "/sys/dev/char/%d:%d/device/%s", maj, min, snprintf(path, PATH_MAX, "%s/%s", real_path, attrs[i]);
attrs[i]);
fp = fopen(path, "r"); fp = fopen(path, "r");
if (!fp) if (!fp)
return -errno; return -errno;
@ -3145,11 +3160,14 @@ static int parse_separate_sysfs_files(int maj, int min,
static int parse_config_sysfs_file(int maj, int min, static int parse_config_sysfs_file(int maj, int min,
drmPciDeviceInfoPtr device) drmPciDeviceInfoPtr device)
{ {
char path[PATH_MAX + 1]; char path[PATH_MAX + 1], real_path[PATH_MAX + 1];
unsigned char config[64]; unsigned char config[64];
int fd, ret; int fd, ret;
snprintf(path, PATH_MAX, "/sys/dev/char/%d:%d/device/config", maj, min); if (get_real_pci_path(maj, min, real_path) == NULL)
return -ENOENT;
snprintf(path, PATH_MAX, "%s/config", real_path);
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd < 0) if (fd < 0)
return -errno; return -errno;