flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 10:26:12 +00:00
Code Issues Releases Wiki Activity

mmio: refactor reg init/fini

Browse Source 
Rearrange register access init and fini so that we properly accomodate
platforms without forcewake.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
This commit is contained in:
Ben Widawsky 2012-01-25 21:04:16 -08:00
parent 802bd74c5f
commit 4c20525b7f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/intel_mmio.c
View File

@ -167,6 +167,13 @@ intel_register_access_init(struct pci_device *pci_dev, int safe)
return -1; return -1;
mmio_data.safe = safe != 0 ? true : false; mmio_data.safe = safe != 0 ? true : false;
mmio_data.i915_devid = pci_dev->device_id;
if (mmio_data.safe)
mmio_data.map = intel_get_register_map(mmio_data.i915_devid);
if (!(IS_GEN6(pci_dev->device_id) ||
IS_GEN7(pci_dev->device_id)))
goto done;
/* Find where the forcewake lock is */ /* Find where the forcewake lock is */
ret = find_debugfs_path("/sys/kernel/debug/dri"); ret = find_debugfs_path("/sys/kernel/debug/dri");
@ -177,12 +184,9 @@ intel_register_access_init(struct pci_device *pci_dev, int safe)
return ret; return ret;
} }
} }
mmio_data.i915_devid = pci_dev->device_id;
if (mmio_data.safe)
mmio_data.map = intel_get_register_map(mmio_data.i915_devid);
mmio_data.key = get_forcewake_lock(); mmio_data.key = get_forcewake_lock();
done:
mmio_data.inited++; mmio_data.inited++;
return 0; return 0;
} }
@ -190,7 +194,8 @@ intel_register_access_init(struct pci_device *pci_dev, int safe)
void void
intel_register_access_fini(void) intel_register_access_fini(void)
{ {
release_forcewake_lock(mmio_data.key); if (mmio_data.key)
release_forcewake_lock(mmio_data.key);
mmio_data.inited--; mmio_data.inited--;
} }