From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 20/28] lib/intel_io: rename mmio setup functions
Date: Sun, 23 Mar 2014 15:18:54 +0100 [thread overview]
Message-ID: <1395584342-11812-21-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1395584342-11812-1-git-send-email-daniel.vetter@ffwll.ch>
Makes their intent a bit clearer.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
lib/intel_io.h | 4 ++--
lib/intel_mmio.c | 6 +++---
tools/intel_audio_dump.c | 4 ++--
tools/intel_backlight.c | 2 +-
tools/intel_gpu_time.c | 2 +-
tools/intel_gpu_top.c | 2 +-
tools/intel_lid.c | 2 +-
tools/intel_reg_checker.c | 2 +-
tools/intel_reg_dumper.c | 2 +-
tools/intel_reg_snapshot.c | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/intel_io.h b/lib/intel_io.h
index 591fd3f446c3..5ea50cab472c 100644
--- a/lib/intel_io.h
+++ b/lib/intel_io.h
@@ -33,8 +33,8 @@
/* register access helpers from intel_mmio.c */
extern void *mmio;
-void intel_get_mmio(struct pci_device *pci_dev);
-void intel_map_file(char *);
+void intel_mmio_use_pci_bar(struct pci_device *pci_dev);
+void intel_mmio_use_dump_file(char *);
int intel_register_access_init(struct pci_device *pci_dev, int safe);
void intel_register_access_fini(void);
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index 444e44507eac..97eee5601f91 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -58,7 +58,7 @@ static struct _mmio_data {
} mmio_data;
void
-intel_map_file(char *file)
+intel_mmio_use_dump_file(char *file)
{
int fd;
struct stat st;
@@ -80,7 +80,7 @@ intel_map_file(char *file)
}
void
-intel_get_mmio(struct pci_device *pci_dev)
+intel_mmio_use_pci_bar(struct pci_device *pci_dev)
{
uint32_t devid, gen;
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 */
if (mmio == NULL)
- intel_get_mmio(pci_dev);
+ intel_mmio_use_pci_bar(pci_dev);
assert(mmio != NULL);
diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c
index 26023743307b..f3bb9ebdfd02 100644
--- a/tools/intel_audio_dump.c
+++ b/tools/intel_audio_dump.c
@@ -2277,9 +2277,9 @@ int main(int argc, char **argv)
do_self_tests();
if (argc == 2)
- intel_map_file(argv[1]);
+ intel_mmio_use_dump_file(argv[1]);
else
- intel_get_mmio(pci_dev);
+ intel_mmio_use_pci_bar(pci_dev);
if (IS_VALLEYVIEW(devid)) {
printf("Valleyview audio registers:\n\n");
diff --git a/tools/intel_backlight.c b/tools/intel_backlight.c
index b866ec8efaee..17deb88d4be8 100644
--- a/tools/intel_backlight.c
+++ b/tools/intel_backlight.c
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
{
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;
max = reg_read(BLC_PWM_PCH_CTL2) >> 16;
diff --git a/tools/intel_gpu_time.c b/tools/intel_gpu_time.c
index 4096f1c5486f..56d65fe07967 100644
--- a/tools/intel_gpu_time.c
+++ b/tools/intel_gpu_time.c
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
static struct rusage rusage;
int status;
- intel_get_mmio(intel_get_pci_device());
+ intel_mmio_use_pci_bar(intel_get_pci_device());
if (argc == 1) {
fprintf(stderr, "usage: %s cmd [args...]\n", argv[0]);
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index a016bc9bdecc..b5cfda043dd9 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -473,7 +473,7 @@ int main(int argc, char **argv)
pci_dev = intel_get_pci_device();
devid = pci_dev->device_id;
- intel_get_mmio(pci_dev);
+ intel_mmio_use_pci_bar(pci_dev);
init_instdone_definitions(devid);
/* Do we have a command to run? */
diff --git a/tools/intel_lid.c b/tools/intel_lid.c
index 7bcb63a772fd..0703e2e1e14e 100644
--- a/tools/intel_lid.c
+++ b/tools/intel_lid.c
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
{
int swf14, acpi_lid;
- intel_get_mmio(intel_get_pci_device());
+ intel_mmio_use_pci_bar(intel_get_pci_device());
while (1) {
swf14 = INREG(SWF14);
diff --git a/tools/intel_reg_checker.c b/tools/intel_reg_checker.c
index 92b06fa152d4..22d979613ea1 100644
--- a/tools/intel_reg_checker.c
+++ b/tools/intel_reg_checker.c
@@ -350,7 +350,7 @@ int main(int argc, char** argv)
dev = intel_get_pci_device();
devid = dev->device_id;
- intel_get_mmio(dev);
+ intel_mmio_use_pci_bar(dev);
if (IS_GEN7(devid))
gen = 7;
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index 04fd6b2d8b8c..4d3d2c7f0f17 100644
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -2931,7 +2931,7 @@ int main(int argc, char** argv)
}
if (file) {
- intel_map_file(file);
+ intel_mmio_use_dump_file(file);
if (devid) {
if (IS_GEN5(devid))
intel_pch = PCH_IBX;
diff --git a/tools/intel_reg_snapshot.c b/tools/intel_reg_snapshot.c
index 166b68e25271..b756bf690217 100644
--- a/tools/intel_reg_snapshot.c
+++ b/tools/intel_reg_snapshot.c
@@ -38,7 +38,7 @@ int main(int argc, char** argv)
pci_dev = intel_get_pci_device();
devid = pci_dev->device_id;
- intel_get_mmio(pci_dev);
+ intel_mmio_use_pci_bar(pci_dev);
if (IS_GEN2(devid))
mmio_bar = 1;
--
1.8.5.2
next prev parent reply other threads:[~2014-03-23 14:19 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-23 14:18 [PATCH 00/28] more i-g-t docs and api polish Daniel Vetter
2014-03-23 14:18 ` [PATCH 01/28] lib: rename intel_pci.c to intel_chipset.c Daniel Vetter
2014-03-23 14:18 ` [PATCH 02/28] lib: consolidate chipset helpers in intel_chipset.[hc] Daniel Vetter
2014-03-23 14:18 ` [PATCH 03/28] lib/intel_chipset: intel_ prefix for pch global Daniel Vetter
2014-03-23 14:18 ` [PATCH 04/28] lib/intel_chipset: api docs Daniel Vetter
2014-03-23 14:18 ` [PATCH 05/28] lib: make rendercopy.h an internal header Daniel Vetter
2014-03-23 14:18 ` [PATCH 06/28] lib: make media_fill.h " Daniel Vetter
2014-03-23 14:18 ` [PATCH 07/28] lib/intel_batchbuffer: un-inline buf_height/width Daniel Vetter
2014-03-23 14:18 ` [PATCH 08/28] lib/intel_batchbuffer: igt_ namespace for the buffer structure Daniel Vetter
2014-03-23 14:18 ` [PATCH 09/28] lib/intel_batchbuffer: igt_ prefix for rendercopy/mediafill funcs Daniel Vetter
2014-03-23 14:18 ` [PATCH 10/28] lib/intel_batchbuffer: drop cpu_mapping from igt_buf Daniel Vetter
2014-03-23 14:18 ` [PATCH 11/28] lib/intel_batchbuffer: api documentation for render copy/media fill Daniel Vetter
2014-03-23 14:18 ` [PATCH 12/28] lib: Move non-register things out of intel-gpu-tools.h Daniel Vetter
2014-03-23 14:18 ` [PATCH 13/28] tests|lib: remove assert.h includes Daniel Vetter
2014-03-23 14:18 ` [PATCH 14/28] lib: add #include "foo.h" lines like in manpages Daniel Vetter
2014-03-23 14:18 ` [PATCH 15/28] lib: remove uncessary #includes from headers Daniel Vetter
2014-03-23 14:18 ` [PATCH 16/28] lib: more unecessary header removal Daniel Vetter
2014-03-23 14:18 ` [PATCH 17/28] lib: unnecessary header removal for drmtest.h, part 1 Daniel Vetter
2014-03-23 14:18 ` [PATCH 18/28] lib: unnecessary header removal for drmtest.h, part 2 Daniel Vetter
2014-03-23 14:18 ` [PATCH 19/28] lib: rename intel_gpu_tools.h to intel_io.h Daniel Vetter
2014-03-23 14:18 ` Daniel Vetter [this message]
2014-03-23 14:18 ` [PATCH 21/28] lib/intel_io: api documentation Daniel Vetter
2014-03-23 14:18 ` [PATCH 22/28] lib: s/drmtest_dumb_aub/igt_aub_dump_enabled/ Daniel Vetter
2014-03-23 14:18 ` [PATCH 23/28] lib: extract igt_aux.[hc] Daniel Vetter
2014-03-23 14:18 ` [PATCH 24/28] lib/igt_aux: api documentation Daniel Vetter
2014-03-23 14:18 ` [PATCH 25/28] lib: s/igt_env_set/igt_check_boolean_env_var Daniel Vetter
2014-03-23 14:19 ` [PATCH 26/28] lib: Use @include tag for include files Daniel Vetter
2014-03-23 14:19 ` [PATCH 27/28] lib/drmtest: api documentation Daniel Vetter
2014-03-23 14:19 ` [PATCH 28/28] lib/intel_batchbuffer: document header dependencies Daniel Vetter
2014-03-23 16:18 ` [PATCH 00/28] more i-g-t docs and api polish Daniel Vetter
2014-03-23 18:04 ` Ben Widawsky
2014-03-23 23:04 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395584342-11812-21-git-send-email-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.