28 Jun
2018
28 Jun
'18
4:09 p.m.
Feel free to add my r-b to this patch.
On 2018-06-25 19:36, Emil Velikov wrote:
From: Emil Velikov emil.velikov@collabora.com
Making the output a little bit easier to parse by human beings.
Signed-off-by: Emil Velikov emil.velikov@collabora.com
tests/drmdevice.c | 78 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/tests/drmdevice.c b/tests/drmdevice.c index 0d75836f..e9e9d7f1 100644 --- a/tests/drmdevice.c +++ b/tests/drmdevice.c @@ -36,67 +36,67 @@ static void print_device_info(drmDevicePtr device, int i, bool print_revision) { printf("device[%i]\n", i);
- printf("\tavailable_nodes %04x\n", device->available_nodes);
- printf("\tnodes\n");
- printf("+->available_nodes %#04x\n", device->available_nodes);
- printf("+->nodes\n"); for (int j = 0; j < DRM_NODE_MAX; j++) if (device->available_nodes & 1 << j)
printf("\t\tnodes[%d] %s\n", j, device->nodes[j]);
printf("| +->nodes[%d] %s\n", j, device->nodes[j]);
- printf("\tbustype %04x\n", device->bustype);
- printf("\tbusinfo\n");
- printf("+->bustype %04x\n", device->bustype);
- printf("+->businfo\n"); if (device->bustype == DRM_BUS_PCI) {
printf("\t\tpci\n");printf("\t\t\tdomain\t%04x\n",device->businfo.pci->domain);printf("\t\t\tbus\t%02x\n", device->businfo.pci->bus);printf("\t\t\tdev\t%02x\n", device->businfo.pci->dev);printf("\t\t\tfunc\t%1u\n", device->businfo.pci->func);printf("\tdeviceinfo\n");printf("\t\tpci\n");printf("\t\t\tvendor_id\t%04x\n", device->deviceinfo.pci->vendor_id);printf("\t\t\tdevice_id\t%04x\n", device->deviceinfo.pci->device_id);printf("\t\t\tsubvendor_id\t%04x\n", device->deviceinfo.pci->subvendor_id);printf("\t\t\tsubdevice_id\t%04x\n", device->deviceinfo.pci->subdevice_id);
printf("| +->pci\n");printf("| +->domain %04x\n",device->businfo.pci->domain);printf("| +->bus %02x\n", device->businfo.pci->bus);printf("| +->dev %02x\n", device->businfo.pci->dev);printf("| +->func %1u\n", device->businfo.pci->func);printf("+->deviceinfo\n");printf(" +->pci\n");printf(" +->vendor_id %04x\n", device->deviceinfo.pci->vendor_id);printf(" +->device_id %04x\n", device->deviceinfo.pci->device_id);printf(" +->subvendor_id %04x\n", device->deviceinfo.pci->subvendor_id);printf(" +->subdevice_id %04x\n", device->deviceinfo.pci->subdevice_id); if (print_revision)
printf("\t\t\trevision_id\t%02x\n", device->deviceinfo.pci->revision_id);
printf(" +->revision_id %02x\n", device->deviceinfo.pci->revision_id); else
printf("\t\t\trevision_id\tIGNORED\n");
printf(" +->revision_id IGNORED\n"); } else if (device->bustype == DRM_BUS_USB) {
printf("\t\tusb\n");printf("\t\t\tbus\t%03u\n", device->businfo.usb->bus);printf("\t\t\tdev\t%03u\n", device->businfo.usb->dev);printf("\tdeviceinfo\n");printf("\t\tusb\n");printf("\t\t\tvendor\t%04x\n", device->deviceinfo.usb->vendor);printf("\t\t\tproduct\t%04x\n", device->deviceinfo.usb->product);
printf("| +->usb\n");printf("| +->bus %03u\n", device->businfo.usb->bus);printf("| +->dev %03u\n", device->businfo.usb->dev);printf("+->deviceinfo\n");printf(" +->usb\n");printf(" +->vendor %04x\n", device->deviceinfo.usb->vendor);printf(" +->product %04x\n", device->deviceinfo.usb->product); } else if (device->bustype == DRM_BUS_PLATFORM) { char **compatible = device->deviceinfo.platform->compatible;
printf("\t\tplatform\n");printf("\t\t\tfullname\t%s\n", device->businfo.platform->fullname);
printf("| +->platform\n");printf("| +->fullname\t%s\n", device->businfo.platform->fullname);
printf("\tdeviceinfo\n");printf("\t\tplatform\n");printf("\t\t\tcompatible\n");
printf("+->deviceinfo\n");printf(" +->platform\n");printf(" +->compatible\n"); while (*compatible) {
printf("\t\t\t\t%s\n", *compatible);
printf(" %s\n", *compatible); compatible++; } } else if (device->bustype == DRM_BUS_HOST1X) { char **compatible = device->deviceinfo.platform->compatible;
printf("\t\thost1x\n");printf("\t\t\tfullname\t%s\n", device->businfo.host1x->fullname);
printf("| +->host1x\n");printf("| +->fullname\t%s\n", device->businfo.host1x->fullname);
printf("\tdeviceinfo\n");printf("\t\tplatform\n");printf("\t\t\tcompatible\n");
printf("+->deviceinfo\n");printf(" +->platform\n");printf(" +->compatible\n"); while (*compatible) {
printf("\t\t\t\t%s\n", *compatible);
printf(" %s\n", *compatible); compatible++; } } else {