diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-12-01 19:51:03 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-03-15 11:37:55 +0000 |
| commit | a50c4eb2a0fd42a3da0eea560876cb43afdb81f2 (patch) | |
| tree | f1b403bc7774b4541f8acdf79dbb746c7835236d | |
| parent | 2c72e78ff54fda078f423384a5d5269e4c59ed4f (diff) | |
loader: use drmGetDevice[s]2 API
By this allows us to fetch the device list/info w/o the revision field.
At the moment retrieving the latter wakes up the device.
Note: kernel patch to resolve that should be in 4.10.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
| -rw-r--r-- | src/loader/loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/loader/loader.c b/src/loader/loader.c index 9b4752d313..5541ccc2a7 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -145,7 +145,7 @@ static char *drm_get_id_path_tag_for_fd(int fd) drmDevicePtr device; char *tag; - if (drmGetDevice(fd, &device) != 0) + if (drmGetDevice2(fd, 0, &device) != 0) return NULL; tag = drm_construct_id_path_tag(device); @@ -179,7 +179,7 @@ int loader_get_user_preferred_fd(int default_fd, int *different_device) if (default_tag == NULL) goto err; - num_devices = drmGetDevices(devices, MAX_DRM_DEVICES); + num_devices = drmGetDevices2(0, devices, MAX_DRM_DEVICES); if (num_devices < 0) goto err; @@ -275,7 +275,7 @@ drm_get_pci_id_for_fd(int fd, int *vendor_id, int *chip_id) drmDevicePtr device; int ret; - if (drmGetDevice(fd, &device) == 0) { + if (drmGetDevice2(fd, 0, &device) == 0) { if (device->bustype == DRM_BUS_PCI) { *vendor_id = device->deviceinfo.pci->vendor_id; *chip_id = device->deviceinfo.pci->device_id; |