diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-21 17:16:03 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-21 17:36:02 +0000 |
commit | 83884e97e18739e3588c6467a210838099d42073 (patch) | |
tree | 778bab4b309c852d3649cc901952267d0cbb5992 /lib/intel_mmio.c | |
parent | 25fbae15262cf570e207e62f50e7c5233e06bc67 (diff) |
Restore "lib: Open debugfs files for the given DRM device"
This reverts commit 25fbae15262cf570e207e62f50e7c5233e06bc67, restoring
commit 301ad44cdf1b868b1ab89096721da91fa8541fdc
Author: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu Mar 2 10:37:11 2017 +0100
lib: Open debugfs files for the given DRM device
with fixes.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/intel_mmio.c')
-rw-r--r-- | lib/intel_mmio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c index 4981daf9..07b9ed14 100644 --- a/lib/intel_mmio.c +++ b/lib/intel_mmio.c @@ -165,7 +165,7 @@ release_forcewake_lock(int fd) * @pci_dev can be obtained from intel_get_pci_device(). */ int -intel_register_access_init(struct pci_device *pci_dev, int safe) +intel_register_access_init(struct pci_device *pci_dev, int safe, int fd) { int ret; @@ -187,7 +187,7 @@ intel_register_access_init(struct pci_device *pci_dev, int safe) /* Find where the forcewake lock is. Forcewake doesn't exist * gen < 6, but the debugfs should do the right things for us. */ - ret = igt_open_forcewake_handle(); + ret = igt_open_forcewake_handle(fd); if (ret == -1) mmio_data.key = FAKEKEY; else |