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

lib/intel_io: rename mmio setup functions

Browse Source 
Makes their intent a bit clearer.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-03-22 22:23:04 +01:00
parent c03c6ceb29
commit 2d4656fb69
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/intel_io.h
View File

@ -33,8 +33,8 @@
/* register access helpers from intel_mmio.c */ /* register access helpers from intel_mmio.c */
extern void *mmio; extern void *mmio;
void intel_get_mmio(struct pci_device *pci_dev); void intel_mmio_use_pci_bar(struct pci_device *pci_dev);
void intel_map_file(char *); void intel_mmio_use_dump_file(char *);
int intel_register_access_init(struct pci_device *pci_dev, int safe); int intel_register_access_init(struct pci_device *pci_dev, int safe);
void intel_register_access_fini(void); void intel_register_access_fini(void);

6
lib/intel_mmio.c
View File

@ -58,7 +58,7 @@ static struct _mmio_data {
} mmio_data; } mmio_data;
void void
intel_map_file(char *file) intel_mmio_use_dump_file(char *file)
{ {
int fd; int fd;
struct stat st; struct stat st;
@ -80,7 +80,7 @@ intel_map_file(char *file)
} }
void void
intel_get_mmio(struct pci_device *pci_dev) intel_mmio_use_pci_bar(struct pci_device *pci_dev)
{ {
uint32_t devid, gen; uint32_t devid, gen;
int mmio_bar, mmio_size; int mmio_bar, mmio_size;
@ -132,7 +132,7 @@ intel_register_access_init(struct pci_device *pci_dev, int safe)
/* after old API is deprecated, remove this */ /* after old API is deprecated, remove this */
if (mmio == NULL) if (mmio == NULL)
intel_get_mmio(pci_dev); intel_mmio_use_pci_bar(pci_dev);
assert(mmio != NULL); assert(mmio != NULL);

4
tools/intel_audio_dump.c
View File

@ -2277,9 +2277,9 @@ int main(int argc, char **argv)
do_self_tests(); do_self_tests();
if (argc == 2) if (argc == 2)
intel_map_file(argv[1]); intel_mmio_use_dump_file(argv[1]);
else else
intel_get_mmio(pci_dev); intel_mmio_use_pci_bar(pci_dev);
if (IS_VALLEYVIEW(devid)) { if (IS_VALLEYVIEW(devid)) {
printf("Valleyview audio registers:\n\n"); printf("Valleyview audio registers:\n\n");

2
tools/intel_backlight.c
View File

@ -50,7 +50,7 @@ int main(int argc, char** argv)
{ {
uint32_t current, max; uint32_t current, max;
intel_get_mmio(intel_get_pci_device()); intel_mmio_use_pci_bar(intel_get_pci_device());
current = reg_read(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK; current = reg_read(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
max = reg_read(BLC_PWM_PCH_CTL2) >> 16; max = reg_read(BLC_PWM_PCH_CTL2) >> 16;

2
tools/intel_gpu_time.c
View File

@ -67,7 +67,7 @@ int main(int argc, char **argv)
static struct rusage rusage; static struct rusage rusage;
int status; int status;
intel_get_mmio(intel_get_pci_device()); intel_mmio_use_pci_bar(intel_get_pci_device());
if (argc == 1) { if (argc == 1) {
fprintf(stderr, "usage: %s cmd [args...]\n", argv[0]); fprintf(stderr, "usage: %s cmd [args...]\n", argv[0]);

2
tools/intel_gpu_top.c
View File

@ -473,7 +473,7 @@ int main(int argc, char **argv)
pci_dev = intel_get_pci_device(); pci_dev = intel_get_pci_device();
devid = pci_dev->device_id; devid = pci_dev->device_id;
intel_get_mmio(pci_dev); intel_mmio_use_pci_bar(pci_dev);
init_instdone_definitions(devid); init_instdone_definitions(devid);
/* Do we have a command to run? */ /* Do we have a command to run? */

2
tools/intel_lid.c
View File

@ -118,7 +118,7 @@ int main(int argc, char **argv)
{ {
int swf14, acpi_lid; int swf14, acpi_lid;
intel_get_mmio(intel_get_pci_device()); intel_mmio_use_pci_bar(intel_get_pci_device());
while (1) { while (1) {
swf14 = INREG(SWF14); swf14 = INREG(SWF14);

2
tools/intel_reg_checker.c
View File

@ -350,7 +350,7 @@ int main(int argc, char** argv)
dev = intel_get_pci_device(); dev = intel_get_pci_device();
devid = dev->device_id; devid = dev->device_id;
intel_get_mmio(dev); intel_mmio_use_pci_bar(dev);
if (IS_GEN7(devid)) if (IS_GEN7(devid))
gen = 7; gen = 7;

2
tools/intel_reg_dumper.c
View File

@ -2931,7 +2931,7 @@ int main(int argc, char** argv)
} }
if (file) { if (file) {
intel_map_file(file); intel_mmio_use_dump_file(file);
if (devid) { if (devid) {
if (IS_GEN5(devid)) if (IS_GEN5(devid))
intel_pch = PCH_IBX; intel_pch = PCH_IBX;

2
tools/intel_reg_snapshot.c
View File

@ -38,7 +38,7 @@ int main(int argc, char** argv)
pci_dev = intel_get_pci_device(); pci_dev = intel_get_pci_device();
devid = pci_dev->device_id; devid = pci_dev->device_id;
intel_get_mmio(pci_dev); intel_mmio_use_pci_bar(pci_dev);
if (IS_GEN2(devid)) if (IS_GEN2(devid))
mmio_bar = 1; mmio_bar = 1;