[igt-dev] [PATCH i-g-t v5 3/5] lib/intel_mmio: add pointer for read/write register funtions

Daniel Mrzyglod
2019-05-09T12:39:28Z

This patch is first move to extend functionality of intel_mmio library.
There was limitation for 1 device, adding pointer for IO functions to
mmaped area gives us possibility to use those IO functions for other mmaped
devices.

v4: reword commitmsg, spelling errors

Signed-off-by: Daniel Mrzyglod <daniel.t.mrzyglod@intel.com>
---
lib/intel_io.h | 12 +-
lib/intel_mmio.c | 29 ++--
tests/i915/i915_pm_lpsp.c | 2 +-
tools/intel_audio_dump.c | 289 +++++++++++++++++++----------------
tools/intel_backlight.c | 10 +-
tools/intel_display_poller.c | 8 +-
tools/intel_gpu_time.c | 6 +-
tools/intel_infoframes.c | 68 ++++-----
tools/intel_lid.c | 2 +-
tools/intel_panel_fitter.c | 24 +--
tools/intel_reg.c | 10 +-
tools/intel_reg_checker.c | 2 +-
tools/intel_watermark.c | 2 +-
13 files changed, 250 insertions(+), 214 deletions(-)

diff --git a/lib/intel_io.h b/lib/intel_io.h
index 6014c485..0674b42c 100644
--- a/lib/intel_io.h
+++ b/lib/intel_io.h
@@ -42,12 +42,12 @@ uint32_t intel_register_read(uint32_t reg);
void intel_register_write(uint32_t reg, uint32_t val);
int intel_register_access_needs_fakewake(void);

-uint32_t INREG(uint32_t reg);
-uint16_t INREG16(uint32_t reg);
-uint8_t INREG8(uint32_t reg);
-void OUTREG(uint32_t reg, uint32_t val);
-void OUTREG16(uint32_t reg, uint16_t val);
-void OUTREG8(uint32_t reg, uint8_t val);
+uint32_t INREG(void *igt_mmio, uint32_t reg);
+uint16_t INREG16(void *igt_mmio, uint32_t reg);
+uint8_t INREG8(void *igt_mmio, uint32_t reg);
+void OUTREG(void *igt_mmio, uint32_t reg, uint32_t val);
+void OUTREG16(void *igt_mmio, uint32_t reg, uint16_t val);
+void OUTREG8(void *igt_mmio, uint32_t reg, uint8_t val);

/* sideband access functions from intel_iosf.c */
uint32_t intel_dpio_reg_read(uint32_t reg, int phy);
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index a5458aeb..d473cd9b 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -309,6 +309,7 @@ write_out:

/**
* INREG:
+ * @igt_mmio maped memory pointer
* @reg: register offset
*
* 32-bit read of the register at offset @reg. This function only works when the
@@ -319,13 +320,14 @@ write_out:
* Returns:
* The value read from the register.
*/
-uint32_t INREG(uint32_t reg)
+uint32_t INREG(void *igt_mmio, uint32_t reg)
{
- return *(volatile uint32_t *)((volatile char *)igt_global_mmio + reg);
+ return *(volatile uint32_t *)((volatile char *)igt_mmio + reg);
}

/**
* INREG16:
+ * @igt_mmio maped memory pointer
* @reg: register offset
*
* 16-bit read of the register at offset @reg. This function only works when the
@@ -336,13 +338,14 @@ uint32_t INREG(uint32_t reg)
* Returns:
* The value read from the register.
*/
-uint16_t INREG16(uint32_t reg)
+uint16_t INREG16(void *igt_mmio, uint32_t reg)
{
- return *(volatile uint16_t *)((volatile char *)igt_global_mmio + reg);
+ return *(volatile uint16_t *)((volatile char *)igt_mmio + reg);
}

/**
* INREG8:
+ * @igt_mmio maped memory pointer
* @reg: register offset
*
* 8-bit read of the register at offset @reg. This function only works when the
@@ -353,13 +356,14 @@ uint16_t INREG16(uint32_t reg)
* Returns:
* The value read from the register.
*/
-uint8_t INREG8(uint32_t reg)
+uint8_t INREG8(void *igt_mmio, uint32_t reg)
{
- return *((volatile uint8_t *)igt_global_mmio + reg);
+ return *((volatile uint8_t *)igt_mmio + reg);
}

/**
* OUTREG:
+ * @igt_mmio maped memory pointer
* @reg: register offset
* @val: value to write
*
@@ -369,9 +373,9 @@ uint8_t INREG8(uint32_t reg)
*
* This function directly accesses the #igt_global_mmio without safety checks.
*/
-void OUTREG(uint32_t reg, uint32_t val)
+void OUTREG(void *igt_mmio, uint32_t reg, uint32_t val)
{
- *(volatile uint32_t *)((volatile char *)igt_global_mmio + reg) = val;
+ *(volatile uint32_t *)((volatile char *)igt_mmio + reg) = val;
}

/**
@@ -385,13 +389,14 @@ void OUTREG(uint32_t reg, uint32_t val)
*
* This function directly accesses the #igt_global_mmio without safety checks.
*/
-void OUTREG16(uint32_t reg, uint16_t val)
+void OUTREG16(void *igt_mmio, uint32_t reg, uint16_t val)
{
- *(volatile uint16_t *)((volatile char *)igt_global_mmio + reg) = val;
+ *(volatile uint16_t *)((volatile char *)igt_mmio + reg) = val;
}

/**
* OUTREG8:
+ * @igt_mmio maped memory pointer
* @reg: register offset
* @val: value to write
*
@@ -401,7 +406,7 @@ void OUTREG16(uint32_t reg, uint16_t val)
*
* This function directly accesses the #igt_global_mmio without safety checks.
*/
-void OUTREG8(uint32_t reg, uint8_t val)
+void OUTREG8(void *igt_mmio, uint32_t reg, uint8_t val)
{
- *((volatile uint8_t *)igt_global_mmio + reg) = val;
+ *((volatile uint8_t *)igt_mmio + reg) = val;
}
diff --git a/tests/i915/i915_pm_lpsp.c b/tests/i915/i915_pm_lpsp.c
index b319dbe9..f69c88f6 100644
--- a/tests/i915/i915_pm_lpsp.c
+++ b/tests/i915/i915_pm_lpsp.c
@@ -40,7 +40,7 @@ static bool lpsp_is_enabled(int drm_fd)
{
uint32_t val;

- val = INREG(HSW_PWR_WELL_CTL2);
+ val = INREG(igt_global_mmio, HSW_PWR_WELL_CTL2);
return !(val & HSW_PWR_WELL_STATE_ENABLED);
}

diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c
index 90260a2f..678e1d08 100644
--- a/tools/intel_audio_dump.c
+++ b/tools/intel_audio_dump.c
@@ -67,23 +67,23 @@ static int disp_reg_base = 0; /* base address of display registers */

#define dump_reg(reg, desc) \
do { \
- dword = INREG(reg); \
+ dword = INREG(igt_global_mmio, reg); \
printf("%-21s(%#x) 0x%08x %s\n", # reg, reg, dword, desc); \
} while (0)

#define dump_disp_reg(reg, desc) \
do { \
- dword = INREG(disp_reg_base + reg); \
+ dword = INREG(igt_global_mmio, disp_reg_base + reg); \
printf("%-21s(%#x) 0x%08x %s\n", # reg, reg, dword, desc); \
} while (0)

#define dump_aud_reg(reg, desc) \
do { \
- dword = INREG(aud_reg_base + reg); \
+ dword = INREG(igt_global_mmio, aud_reg_base + reg); \
printf("%-21s(%#x) 0x%08x %s\n", # reg, reg, dword, desc); \
} while (0)

-#define read_aud_reg(reg) INREG(aud_reg_base + (reg))
+#define read_aud_reg(reg) INREG(igt_global_mmio, aud_reg_base + (reg))

static int get_num_pipes(void)
{
@@ -532,31 +532,31 @@ static void dump_eaglelake(void)

printf("\nDetails:\n\n");

- dword = INREG(AUD_VID_DID);
+ dword = INREG(igt_global_mmio, AUD_VID_DID);
printf("AUD_VID_DID vendor id\t\t\t0x%x\n", dword >> 16);
printf("AUD_VID_DID device id\t\t\t0x%x\n", dword & 0xffff);

- dword = INREG(AUD_RID);
+ dword = INREG(igt_global_mmio, AUD_RID);
printf("AUD_RID major revision\t\t\t0x%lx\n", BITS(dword, 23, 20));
printf("AUD_RID minor revision\t\t\t0x%lx\n", BITS(dword, 19, 16));
printf("AUD_RID revision id\t\t\t0x%lx\n", BITS(dword, 15, 8));
printf("AUD_RID stepping id\t\t\t0x%lx\n", BITS(dword, 7, 0));

- dword = INREG(SDVOB);
+ dword = INREG(igt_global_mmio, SDVOB);
printf("SDVOB enable\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
printf("SDVOB HDMI encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_HDMI));
printf("SDVOB SDVO encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_SDVO));
printf("SDVOB null packets\t\t\t%u\n", !!(dword & SDVO_NULL_PACKETS_DURING_VSYNC));
printf("SDVOB audio enabled\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));

- dword = INREG(SDVOC);
+ dword = INREG(igt_global_mmio, SDVOC);
printf("SDVOC enable\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
printf("SDVOC HDMI encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_HDMI));
printf("SDVOC SDVO encoding\t\t\t%u\n", !!(dword & SDVO_ENCODING_SDVO));
printf("SDVOC null packets\t\t\t%u\n", !!(dword & SDVO_NULL_PACKETS_DURING_VSYNC));
printf("SDVOC audio enabled\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));

- dword = INREG(PORT_HOTPLUG_EN);
+ dword = INREG(igt_global_mmio, PORT_HOTPLUG_EN);
printf("PORT_HOTPLUG_EN DisplayPort/HDMI port B\t%ld\n", BIT(dword, 29)),
printf("PORT_HOTPLUG_EN DisplayPort/HDMI port C\t%ld\n", BIT(dword, 28)),
printf("PORT_HOTPLUG_EN DisplayPort port D\t%ld\n", BIT(dword, 27)),
@@ -566,7 +566,7 @@ static void dump_eaglelake(void)
printf("PORT_HOTPLUG_EN TV\t\t\t%ld\n", BIT(dword, 23)),
printf("PORT_HOTPLUG_EN CRT\t\t\t%ld\n", BIT(dword, 9)),

- dword = INREG(VIDEO_DIP_CTL);
+ dword = INREG(igt_global_mmio, VIDEO_DIP_CTL);
printf("VIDEO_DIP_CTL enable graphics DIP\t%ld\n", BIT(dword, 31)),
printf("VIDEO_DIP_CTL port select\t\t[0x%lx] %s\n",
BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
@@ -581,46 +581,46 @@ static void dump_eaglelake(void)
printf("VIDEO_DIP_CTL DIP buffer size\t\t%lu\n", BITS(dword, 11, 8));
printf("VIDEO_DIP_CTL DIP address\t\t%lu\n", BITS(dword, 3, 0));

- dword = INREG(AUD_CONFIG);
+ dword = INREG(igt_global_mmio, AUD_CONFIG);
printf("AUD_CONFIG pixel clock\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
OPNAME(pixel_clock, BITS(dword, 19, 16)));
printf("AUD_CONFIG fabrication enabled\t\t%lu\n", BITS(dword, 2, 2));
printf("AUD_CONFIG professional use allowed\t%lu\n", BIT(dword, 1));
printf("AUD_CONFIG fuse enabled\t\t\t%lu\n", BIT(dword, 0));

- dword = INREG(AUD_DEBUG);
+ dword = INREG(igt_global_mmio, AUD_DEBUG);
printf("AUD_DEBUG function reset\t\t%lu\n", BIT(dword, 0));

- dword = INREG(AUD_SUBN_CNT);
+ dword = INREG(igt_global_mmio, AUD_SUBN_CNT);
printf("AUD_SUBN_CNT starting node number\t0x%lx\n", BITS(dword, 23, 16));
printf("AUD_SUBN_CNT total number of nodes\t0x%lx\n", BITS(dword, 7, 0));

- dword = INREG(AUD_SUBN_CNT2);
+ dword = INREG(igt_global_mmio, AUD_SUBN_CNT2);
printf("AUD_SUBN_CNT2 starting node number\t0x%lx\n", BITS(dword, 24, 16));
printf("AUD_SUBN_CNT2 total number of nodes\t0x%lx\n", BITS(dword, 7, 0));

- dword = INREG(AUD_FUNC_GRP);
+ dword = INREG(igt_global_mmio, AUD_FUNC_GRP);
printf("AUD_FUNC_GRP unsol capable\t\t%lu\n", BIT(dword, 8));
printf("AUD_FUNC_GRP node type\t\t\t0x%lx\n", BITS(dword, 7, 0));

- dword = INREG(AUD_GRP_CAP);
+ dword = INREG(igt_global_mmio, AUD_GRP_CAP);
printf("AUD_GRP_CAP beep 0\t\t\t%lu\n", BIT(dword, 16));
printf("AUD_GRP_CAP input delay\t\t\t%lu\n", BITS(dword, 11, 8));
printf("AUD_GRP_CAP output delay\t\t%lu\n", BITS(dword, 3, 0));

- dword = INREG(AUD_PWRST);
+ dword = INREG(igt_global_mmio, AUD_PWRST);
printf("AUD_PWRST device power state\t\t%s\n",
power_state[BITS(dword, 5, 4)]);
printf("AUD_PWRST device power state setting\t%s\n",
power_state[BITS(dword, 1, 0)]);

- dword = INREG(AUD_SUPPWR);
+ dword = INREG(igt_global_mmio, AUD_SUPPWR);
printf("AUD_SUPPWR support D0\t\t\t%lu\n", BIT(dword, 0));
printf("AUD_SUPPWR support D1\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_SUPPWR support D2\t\t\t%lu\n", BIT(dword, 2));
printf("AUD_SUPPWR support D3\t\t\t%lu\n", BIT(dword, 3));

- dword = INREG(AUD_OUT_CWCAP);
+ dword = INREG(igt_global_mmio, AUD_OUT_CWCAP);
printf("AUD_OUT_CWCAP widget type\t\t0x%lx\n", BITS(dword, 23, 20));
printf("AUD_OUT_CWCAP sample delay\t\t0x%lx\n", BITS(dword, 19, 16));
printf("AUD_OUT_CWCAP channel count\t\t%lu\n",
@@ -636,7 +636,7 @@ static void dump_eaglelake(void)
printf("AUD_OUT_CWCAP out amp present\t\t%lu\n", BIT(dword, 2));
printf("AUD_OUT_CWCAP in amp present\t\t%lu\n", BIT(dword, 1));

- dword = INREG(AUD_OUT_DIG_CNVT);
+ dword = INREG(igt_global_mmio, AUD_OUT_DIG_CNVT);
printf("AUD_OUT_DIG_CNVT SPDIF category\t\t0x%lx\n", BITS(dword, 14, 8));
printf("AUD_OUT_DIG_CNVT SPDIF level\t\t%lu\n", BIT(dword, 7));
printf("AUD_OUT_DIG_CNVT professional\t\t%lu\n", BIT(dword, 6));
@@ -647,16 +647,16 @@ static void dump_eaglelake(void)
printf("AUD_OUT_DIG_CNVT validity flag\t\t%lu\n", BIT(dword, 1));
printf("AUD_OUT_DIG_CNVT digital enable\t\t%lu\n", BIT(dword, 0));

- dword = INREG(AUD_OUT_CH_STR);
+ dword = INREG(igt_global_mmio, AUD_OUT_CH_STR);
printf("AUD_OUT_CH_STR stream id\t\t0x%lx\n", BITS(dword, 7, 4));
printf("AUD_OUT_CH_STR lowest channel\t\t%lu\n", BITS(dword, 3, 0));

- dword = INREG(AUD_OUT_STR_DESC);
+ dword = INREG(igt_global_mmio, AUD_OUT_STR_DESC);
printf("AUD_OUT_STR_DESC stream channels\t%lu\n", BITS(dword, 3, 0) + 1);
printf("AUD_OUT_STR_DESC Bits per Sample\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));

- dword = INREG(AUD_PINW_CAP);
+ dword = INREG(igt_global_mmio, AUD_PINW_CAP);
printf("AUD_PINW_CAP widget type\t\t0x%lx\n", BITS(dword, 23, 20));
printf("AUD_PINW_CAP sample delay\t\t0x%lx\n", BITS(dword, 19, 16));
printf("AUD_PINW_CAP channel count\t\t%lu\n",
@@ -674,13 +674,13 @@ static void dump_eaglelake(void)
printf("AUD_PINW_CAP in amp present\t\t%lu\n", BIT(dword, 1));

- dword = INREG(AUD_PIN_CAP);
+ dword = INREG(igt_global_mmio, AUD_PIN_CAP);
printf("AUD_PIN_CAP EAPD\t\t\t%lu\n", BIT(dword, 16));
printf("AUD_PIN_CAP HDMI\t\t\t%lu\n", BIT(dword, 7));
printf("AUD_PIN_CAP output\t\t\t%lu\n", BIT(dword, 4));
printf("AUD_PIN_CAP presence detect\t\t%lu\n", BIT(dword, 2));

- dword = INREG(AUD_PINW_CNTR);
+ dword = INREG(igt_global_mmio, AUD_PINW_CNTR);
printf("AUD_PINW_CNTR mute status\t\t%lu\n", BIT(dword, 8));
printf("AUD_PINW_CNTR out enable\t\t%lu\n", BIT(dword, 6));
printf("AUD_PINW_CNTR amp mute status\t\t%lu\n", BIT(dword, 8));
@@ -689,10 +689,10 @@ static void dump_eaglelake(void)
BITS(dword, 2, 0),
OPNAME(stream_type, BITS(dword, 2, 0)));

- dword = INREG(AUD_PINW_UNSOLRESP);
+ dword = INREG(igt_global_mmio, AUD_PINW_UNSOLRESP);
printf("AUD_PINW_UNSOLRESP enable unsol resp\t%lu\n", BIT(dword, 31));

- dword = INREG(AUD_CNTL_ST);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST);
printf("AUD_CNTL_ST DIP audio enabled\t\t%lu\n", BIT(dword, 21));
printf("AUD_CNTL_ST DIP ACP enabled\t\t%lu\n", BIT(dword, 22));
printf("AUD_CNTL_ST DIP ISRCx enabled\t\t%lu\n", BIT(dword, 23));
@@ -709,38 +709,39 @@ static void dump_eaglelake(void)
printf("AUD_CNTL_ST ELD bufsize\t\t\t%lu\n", BITS(dword, 13, 9));
printf("AUD_CNTL_ST ELD address\t\t\t%lu\n", BITS(dword, 8, 5));

- dword = INREG(AUD_HDMIW_STATUS);
+ dword = INREG(igt_global_mmio, AUD_HDMIW_STATUS);
printf("AUD_HDMIW_STATUS CDCLK/DOTCLK underrun\t%lu\n", BIT(dword, 31));
printf("AUD_HDMIW_STATUS CDCLK/DOTCLK overrun\t%lu\n", BIT(dword, 30));
printf("AUD_HDMIW_STATUS BCLK/CDCLK underrun\t%lu\n", BIT(dword, 29));
printf("AUD_HDMIW_STATUS BCLK/CDCLK overrun\t%lu\n", BIT(dword, 28));

- dword = INREG(AUD_CONV_CHCNT);
+ dword = INREG(igt_global_mmio, AUD_CONV_CHCNT);
printf("AUD_CONV_CHCNT HDMI HBR enabled\t\t%lu\n", BITS(dword, 15, 14));
printf("AUD_CONV_CHCNT HDMI channel count\t%lu\n", BITS(dword, 11, 8) + 1);

printf("AUD_CONV_CHCNT HDMI channel mapping:\n");
for (i = 0; i < 8; i++) {
- OUTREG(AUD_CONV_CHCNT, i);
- dword = INREG(AUD_CONV_CHCNT);
+ OUTREG(igt_global_mmio, AUD_CONV_CHCNT, i);
+ dword = INREG(igt_global_mmio, AUD_CONV_CHCNT);
printf("\t\t\t\t\t[0x%x] %u => %lu\n", dword, i, BITS(dword, 7, 4));
}

printf("AUD_HDMIW_HDMIEDID HDMI ELD:\n\t");
- dword = INREG(AUD_CNTL_ST);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST);
dword &= ~BITMASK(8, 5);
- OUTREG(AUD_CNTL_ST, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST, dword);
for (i = 0; i < BITS(dword, 14, 10) / 4; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_HDMIEDID)));
+ printf("%08x ", htonl(INREG(igt_global_mmio, AUD_HDMIW_HDMIEDID)));
printf("\n");

printf("AUD_HDMIW_INFOFR HDMI audio Infoframe:\n\t");
- dword = INREG(AUD_CNTL_ST);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST);
dword &= ~BITMASK(20, 18);
dword &= ~BITMASK(3, 0);
- OUTREG(AUD_CNTL_ST, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST, dword);
for (i = 0; i < 8; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_INFOFR)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_INFOFR)));
printf("\n");
}

@@ -863,7 +864,7 @@ static void dump_cpt(void)

printf("\nDetails:\n\n");

- dword = INREG(VIDEO_DIP_CTL_A);
+ dword = INREG(igt_global_mmio, VIDEO_DIP_CTL_A);
printf("VIDEO_DIP_CTL_A Enable_Graphics_DIP\t\t\t%ld\n", BIT(dword, 31)),
printf("VIDEO_DIP_CTL_A GCP_DIP_enable\t\t\t\t%ld\n", BIT(dword, 25)),
printf("VIDEO_DIP_CTL_A Video_DIP_type_enable AVI\t\t%lu\n", BIT(dword, 21));
@@ -877,7 +878,7 @@ static void dump_cpt(void)
printf("VIDEO_DIP_CTL_A Video_DIP_buffer_size\t\t\t%lu\n", BITS(dword, 11, 8));
printf("VIDEO_DIP_CTL_A Video_DIP_access_address\t\t%lu\n", BITS(dword, 3, 0));

- dword = INREG(VIDEO_DIP_CTL_B);
+ dword = INREG(igt_global_mmio, VIDEO_DIP_CTL_B);
printf("VIDEO_DIP_CTL_B Enable_Graphics_DIP\t\t\t%ld\n", BIT(dword, 31)),
printf("VIDEO_DIP_CTL_B GCP_DIP_enable\t\t\t\t%ld\n", BIT(dword, 25)),
printf("VIDEO_DIP_CTL_B Video_DIP_type_enable AVI\t\t%lu\n", BIT(dword, 21));
@@ -891,7 +892,7 @@ static void dump_cpt(void)
printf("VIDEO_DIP_CTL_B Video_DIP_buffer_size\t\t\t%lu\n", BITS(dword, 11, 8));
printf("VIDEO_DIP_CTL_B Video_DIP_access_address\t\t%lu\n", BITS(dword, 3, 0));

- dword = INREG(VIDEO_DIP_CTL_C);
+ dword = INREG(igt_global_mmio, VIDEO_DIP_CTL_C);
printf("VIDEO_DIP_CTL_C Enable_Graphics_DIP\t\t\t%ld\n", BIT(dword, 31)),
printf("VIDEO_DIP_CTL_C GCP_DIP_enable\t\t\t\t%ld\n", BIT(dword, 25)),
printf("VIDEO_DIP_CTL_C Video_DIP_type_enable AVI\t\t%lu\n", BIT(dword, 21));
@@ -905,17 +906,17 @@ static void dump_cpt(void)
printf("VIDEO_DIP_CTL_C Video_DIP_buffer_size\t\t\t%lu\n", BITS(dword, 11, 8));
printf("VIDEO_DIP_CTL_C Video_DIP_access_address\t\t%lu\n", BITS(dword, 3, 0));

- dword = INREG(AUD_VID_DID);
+ dword = INREG(igt_global_mmio, AUD_VID_DID);
printf("AUD_VID_DID vendor id\t\t\t\t\t0x%x\n", dword >> 16);
printf("AUD_VID_DID device id\t\t\t\t\t0x%x\n", dword & 0xffff);

- dword = INREG(AUD_RID);
+ dword = INREG(igt_global_mmio, AUD_RID);
printf("AUD_RID Major_Revision\t\t\t\t\t0x%lx\n", BITS(dword, 23, 20));
printf("AUD_RID Minor_Revision\t\t\t\t\t0x%lx\n", BITS(dword, 19, 16));
printf("AUD_RID Revision_Id\t\t\t\t\t0x%lx\n", BITS(dword, 15, 8));
printf("AUD_RID Stepping_Id\t\t\t\t\t0x%lx\n", BITS(dword, 7, 0));

- dword = INREG(HDMIB);
+ dword = INREG(igt_global_mmio, HDMIB);
printf("HDMIB Port_Enable\t\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
printf("HDMIB Transcoder_Select\t\t\t\t\t[0x%lx] %s\n",
BITS(dword, 30, 29), transcoder_select[BITS(dword, 30, 29)]);
@@ -928,7 +929,7 @@ static void dump_cpt(void)
printf("HDMIB HDMI_or_DVI_Select\t\t\t\t%s\n", BIT(dword, 9) ? "HDMI" : "DVI");
printf("HDMIB Audio_Output_Enable\t\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));

- dword = INREG(HDMIC);
+ dword = INREG(igt_global_mmio, HDMIC);
printf("HDMIC Port_Enable\t\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
printf("HDMIC Transcoder_Select\t\t\t\t\t[0x%lx] %s\n",
BITS(dword, 30, 29), transcoder_select[BITS(dword, 30, 29)]);
@@ -941,7 +942,7 @@ static void dump_cpt(void)
printf("HDMIC HDMI_or_DVI_Select\t\t\t\t%s\n", BIT(dword, 9) ? "HDMI" : "DVI");
printf("HDMIC Audio_Output_Enable\t\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));

- dword = INREG(HDMID);
+ dword = INREG(igt_global_mmio, HDMID);
printf("HDMID Port_Enable\t\t\t\t\t%u\n", !!(dword & SDVO_ENABLE));
printf("HDMID Transcoder_Select\t\t\t\t\t[0x%lx] %s\n",
BITS(dword, 30, 29), transcoder_select[BITS(dword, 30, 29)]);
@@ -954,7 +955,7 @@ static void dump_cpt(void)
printf("HDMID HDMI_or_DVI_Select\t\t\t\t%s\n", BIT(dword, 9) ? "HDMI" : "DVI");
printf("HDMID Audio_Output_Enable\t\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));

- dword = INREG(DP_CTL_B);
+ dword = INREG(igt_global_mmio, DP_CTL_B);
printf("DP_CTL_B DisplayPort_Enable\t\t\t\t%lu\n", BIT(dword, 31));
printf("DP_CTL_B Port_Width_Selection\t\t\t\t[0x%lx] %s\n",
BITS(dword, 21, 19), dp_port_width[BITS(dword, 21, 19)]);
@@ -962,7 +963,7 @@ static void dump_cpt(void)
printf("DP_CTL_B HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
printf("DP_CTL_B Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));

- dword = INREG(DP_CTL_C);
+ dword = INREG(igt_global_mmio, DP_CTL_C);
printf("DP_CTL_C DisplayPort_Enable\t\t\t\t%lu\n", BIT(dword, 31));
printf("DP_CTL_C Port_Width_Selection\t\t\t\t[0x%lx] %s\n",
BITS(dword, 21, 19), dp_port_width[BITS(dword, 21, 19)]);
@@ -970,7 +971,7 @@ static void dump_cpt(void)
printf("DP_CTL_C HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
printf("DP_CTL_C Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));

- dword = INREG(DP_CTL_D);
+ dword = INREG(igt_global_mmio, DP_CTL_D);
printf("DP_CTL_D DisplayPort_Enable\t\t\t\t%lu\n", BIT(dword, 31));
printf("DP_CTL_D Port_Width_Selection\t\t\t\t[0x%lx] %s\n",
BITS(dword, 21, 19), dp_port_width[BITS(dword, 21, 19)]);
@@ -978,7 +979,7 @@ static void dump_cpt(void)
printf("DP_CTL_D HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
printf("DP_CTL_D Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));

- dword = INREG(AUD_CONFIG_A);
+ dword = INREG(igt_global_mmio, AUD_CONFIG_A);
printf("AUD_CONFIG_A N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
n_index_value[BIT(dword, 29)]);
printf("AUD_CONFIG_A N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
@@ -987,7 +988,7 @@ static void dump_cpt(void)
printf("AUD_CONFIG_A Pixel_Clock_HDMI\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
OPNAME(pixel_clock, BITS(dword, 19, 16)));
printf("AUD_CONFIG_A Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
- dword = INREG(AUD_CONFIG_B);
+ dword = INREG(igt_global_mmio, AUD_CONFIG_B);
printf("AUD_CONFIG_B N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
n_index_value[BIT(dword, 29)]);
printf("AUD_CONFIG_B N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
@@ -996,7 +997,7 @@ static void dump_cpt(void)
printf("AUD_CONFIG_B Pixel_Clock_HDMI\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
OPNAME(pixel_clock, BITS(dword, 19, 16)));
printf("AUD_CONFIG_B Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
- dword = INREG(AUD_CONFIG_C);
+ dword = INREG(igt_global_mmio, AUD_CONFIG_C);
printf("AUD_CONFIG_C N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
n_index_value[BIT(dword, 29)]);
printf("AUD_CONFIG_C N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
@@ -1006,36 +1007,36 @@ static void dump_cpt(void)
OPNAME(pixel_clock, BITS(dword, 19, 16)));
printf("AUD_CONFIG_C Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));

- dword = INREG(AUD_CTS_ENABLE_A);
+ dword = INREG(igt_global_mmio, AUD_CTS_ENABLE_A);
printf("AUD_CTS_ENABLE_A Enable_CTS_or_M_programming\t\t%lu\n", BIT(dword, 20));
printf("AUD_CTS_ENABLE_A CTS_M value Index\t\t\t%s\n", BIT(dword, 21) ? "CTS" : "M");
printf("AUD_CTS_ENABLE_A CTS_programming\t\t\t%#lx\n", BITS(dword, 19, 0));
- dword = INREG(AUD_CTS_ENABLE_B);
+ dword = INREG(igt_global_mmio, AUD_CTS_ENABLE_B);
printf("AUD_CTS_ENABLE_B Enable_CTS_or_M_programming\t\t%lu\n", BIT(dword, 20));
printf("AUD_CTS_ENABLE_B CTS_M value Index\t\t\t%s\n", BIT(dword, 21) ? "CTS" : "M");
printf("AUD_CTS_ENABLE_B CTS_programming\t\t\t%#lx\n", BITS(dword, 19, 0));
- dword = INREG(AUD_CTS_ENABLE_C);
+ dword = INREG(igt_global_mmio, AUD_CTS_ENABLE_C);
printf("AUD_CTS_ENABLE_C Enable_CTS_or_M_programming\t\t%lu\n", BIT(dword, 20));
printf("AUD_CTS_ENABLE_C CTS_M value Index\t\t\t%s\n", BIT(dword, 21) ? "CTS" : "M");
printf("AUD_CTS_ENABLE_C CTS_programming\t\t\t%#lx\n", BITS(dword, 19, 0));

- dword = INREG(AUD_MISC_CTRL_A);
+ dword = INREG(igt_global_mmio, AUD_MISC_CTRL_A);
printf("AUD_MISC_CTRL_A Sample_Fabrication_EN_bit\t\t%lu\n", BIT(dword, 2));
printf("AUD_MISC_CTRL_A Sample_present_Disable\t\t\t%lu\n", BIT(dword, 8));
printf("AUD_MISC_CTRL_A Output_Delay\t\t\t\t%lu\n", BITS(dword, 7, 4));
printf("AUD_MISC_CTRL_A Pro_Allowed\t\t\t\t%lu\n", BIT(dword, 1));
- dword = INREG(AUD_MISC_CTRL_B);
+ dword = INREG(igt_global_mmio, AUD_MISC_CTRL_B);
printf("AUD_MISC_CTRL_B Sample_Fabrication_EN_bit\t\t%lu\n", BIT(dword, 2));
printf("AUD_MISC_CTRL_B Sample_present_Disable\t\t\t%lu\n", BIT(dword, 8));
printf("AUD_MISC_CTRL_B Output_Delay\t\t\t\t%lu\n", BITS(dword, 7, 4));
printf("AUD_MISC_CTRL_B Pro_Allowed\t\t\t\t%lu\n", BIT(dword, 1));
- dword = INREG(AUD_MISC_CTRL_C);
+ dword = INREG(igt_global_mmio, AUD_MISC_CTRL_C);
printf("AUD_MISC_CTRL_C Sample_Fabrication_EN_bit\t\t%lu\n", BIT(dword, 2));
printf("AUD_MISC_CTRL_C Sample_present_Disable\t\t\t%lu\n", BIT(dword, 8));
printf("AUD_MISC_CTRL_C Output_Delay\t\t\t\t%lu\n", BITS(dword, 7, 4));
printf("AUD_MISC_CTRL_C Pro_Allowed\t\t\t\t%lu\n", BIT(dword, 1));

- dword = INREG(AUD_PWRST);
+ dword = INREG(igt_global_mmio, AUD_PWRST);
printf("AUD_PWRST Func_Grp_Dev_PwrSt_Curr \t%s\n", power_state[BITS(dword, 27, 26)]);
printf("AUD_PWRST Func_Grp_Dev_PwrSt_Set \t%s\n", power_state[BITS(dword, 25, 24)]);
printf("AUD_PWRST ConvertorA_Widget_Power_State_Current \t%s\n", power_state[BITS(dword, 15, 14)]);
@@ -1051,7 +1052,7 @@ static void dump_cpt(void)
printf("AUD_PWRST PinD_Widget_Power_State_Current \t%s\n", power_state[BITS(dword, 11, 10)]);
printf("AUD_PWRST PinD_Widget_Power_State_Set \t%s\n", power_state[BITS(dword, 9, 8)]);

- dword = INREG(AUD_PORT_EN_HD_CFG);
+ dword = INREG(igt_global_mmio, AUD_PORT_EN_HD_CFG);
printf("AUD_PORT_EN_HD_CFG Convertor_A_Digen\t\t\t%lu\n", BIT(dword, 0));
printf("AUD_PORT_EN_HD_CFG Convertor_B_Digen\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_PORT_EN_HD_CFG Convertor_C_Digen\t\t\t%lu\n", BIT(dword, 2));
@@ -1065,7 +1066,7 @@ static void dump_cpt(void)
printf("AUD_PORT_EN_HD_CFG Port_C_Amp_Mute_Status\t\t%lu\n", BIT(dword, 21));
printf("AUD_PORT_EN_HD_CFG Port_D_Amp_Mute_Status\t\t%lu\n", BIT(dword, 22));

- dword = INREG(AUD_OUT_DIG_CNVT_A);
+ dword = INREG(igt_global_mmio, AUD_OUT_DIG_CNVT_A);
printf("AUD_OUT_DIG_CNVT_A V\t\t\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_OUT_DIG_CNVT_A VCFG\t\t\t\t%lu\n", BIT(dword, 2));
printf("AUD_OUT_DIG_CNVT_A PRE\t\t\t\t\t%lu\n", BIT(dword, 3));
@@ -1077,7 +1078,7 @@ static void dump_cpt(void)
printf("AUD_OUT_DIG_CNVT_A Lowest_Channel_Number\t\t%lu\n", BITS(dword, 19, 16));
printf("AUD_OUT_DIG_CNVT_A Stream_ID\t\t\t\t%lu\n", BITS(dword, 23, 20));

- dword = INREG(AUD_OUT_DIG_CNVT_B);
+ dword = INREG(igt_global_mmio, AUD_OUT_DIG_CNVT_B);
printf("AUD_OUT_DIG_CNVT_B V\t\t\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_OUT_DIG_CNVT_B VCFG\t\t\t\t%lu\n", BIT(dword, 2));
printf("AUD_OUT_DIG_CNVT_B PRE\t\t\t\t\t%lu\n", BIT(dword, 3));
@@ -1089,7 +1090,7 @@ static void dump_cpt(void)
printf("AUD_OUT_DIG_CNVT_B Lowest_Channel_Number\t\t%lu\n", BITS(dword, 19, 16));
printf("AUD_OUT_DIG_CNVT_B Stream_ID\t\t\t\t%lu\n", BITS(dword, 23, 20));

- dword = INREG(AUD_OUT_DIG_CNVT_C);
+ dword = INREG(igt_global_mmio, AUD_OUT_DIG_CNVT_C);
printf("AUD_OUT_DIG_CNVT_C V\t\t\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_OUT_DIG_CNVT_C VCFG\t\t\t\t%lu\n", BIT(dword, 2));
printf("AUD_OUT_DIG_CNVT_C PRE\t\t\t\t\t%lu\n", BIT(dword, 3));
@@ -1103,8 +1104,9 @@ static void dump_cpt(void)

printf("AUD_OUT_CH_STR Converter_Channel_MAP PORTB PORTC PORTD\n");
for (i = 0; i < 8; i++) {
- OUTREG(AUD_OUT_CH_STR, i | (i << 8) | (i << 16));
- dword = INREG(AUD_OUT_CH_STR);
+ OUTREG(igt_global_mmio, AUD_OUT_CH_STR, i | (i << 8) |
+ (i << 16));
+ dword = INREG(igt_global_mmio, AUD_OUT_CH_STR);
printf("\t\t\t\t%lu\t%lu\t%lu\t%lu\n",
1 + BITS(dword, 3, 0),
1 + BITS(dword, 7, 4),
@@ -1112,33 +1114,33 @@ static void dump_cpt(void)
1 + BITS(dword, 23, 20));
}

- dword = INREG(AUD_OUT_STR_DESC_A);
+ dword = INREG(igt_global_mmio, AUD_OUT_STR_DESC_A);
printf("AUD_OUT_STR_DESC_A HBR_enable\t\t\t\t%lu\n", BITS(dword, 28, 27));
printf("AUD_OUT_STR_DESC_A Convertor_Channel_Count\t\t%lu\n", BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_A Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_A Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));

- dword = INREG(AUD_OUT_STR_DESC_B);
+ dword = INREG(igt_global_mmio, AUD_OUT_STR_DESC_B);
printf("AUD_OUT_STR_DESC_B HBR_enable\t\t\t\t%lu\n", BITS(dword, 28, 27));
printf("AUD_OUT_STR_DESC_B Convertor_Channel_Count\t\t%lu\n", BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_B Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_B Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));

- dword = INREG(AUD_OUT_STR_DESC_C);
+ dword = INREG(igt_global_mmio, AUD_OUT_STR_DESC_C);
printf("AUD_OUT_STR_DESC_C HBR_enable\t\t\t\t%lu\n", BITS(dword, 28, 27));
printf("AUD_OUT_STR_DESC_C Convertor_Channel_Count\t\t%lu\n", BITS(dword, 20, 16) + 1);
printf("AUD_OUT_STR_DESC_C Bits_per_Sample\t\t\t[%#lx] %s\n",
BITS(dword, 6, 4), OPNAME(bits_per_sample, BITS(dword, 6, 4)));
printf("AUD_OUT_STR_DESC_C Number_of_Channels_in_a_Stream\t%lu\n", 1 + BITS(dword, 3, 0));

- dword = INREG(AUD_PINW_CONNLNG_SEL);
+ dword = INREG(igt_global_mmio, AUD_PINW_CONNLNG_SEL);
printf("AUD_PINW_CONNLNG_SEL Connection_select_Control_B\t%#lx\n", BITS(dword, 7, 0));
printf("AUD_PINW_CONNLNG_SEL Connection_select_Control_C\t%#lx\n", BITS(dword, 15, 8));
printf("AUD_PINW_CONNLNG_SEL Connection_select_Control_D\t%#lx\n", BITS(dword, 23, 16));

- dword = INREG(AUD_CNTL_ST_A);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_A);
printf("AUD_CNTL_ST_A DIP_Port_Select\t\t\t\t[%#lx] %s\n",
BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
printf("AUD_CNTL_ST_A DIP_type_enable_status Audio DIP\t\t%lu\n", BIT(dword, 21));
@@ -1149,7 +1151,7 @@ static void dump_cpt(void)
printf("AUD_CNTL_ST_A ELD_ACK\t\t\t\t\t%lu\n", BIT(dword, 4));
printf("AUD_CNTL_ST_A ELD_buffer_size\t\t\t\t%lu\n", BITS(dword, 14, 10));

- dword = INREG(AUD_CNTL_ST_B);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_B);
printf("AUD_CNTL_ST_B DIP_Port_Select\t\t\t\t[%#lx] %s\n",
BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
printf("AUD_CNTL_ST_B DIP_type_enable_status Audio DIP\t\t%lu\n", BIT(dword, 21));
@@ -1160,7 +1162,7 @@ static void dump_cpt(void)
printf("AUD_CNTL_ST_B ELD_ACK\t\t\t\t\t%lu\n", BIT(dword, 4));
printf("AUD_CNTL_ST_B ELD_buffer_size\t\t\t\t%lu\n", BITS(dword, 14, 10));

- dword = INREG(AUD_CNTL_ST_C);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_C);
printf("AUD_CNTL_ST_C DIP_Port_Select\t\t\t\t[%#lx] %s\n",
BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
printf("AUD_CNTL_ST_C DIP_type_enable_status Audio DIP\t\t%lu\n", BIT(dword, 21));
@@ -1171,7 +1173,7 @@ static void dump_cpt(void)
printf("AUD_CNTL_ST_C ELD_ACK\t\t\t\t\t%lu\n", BIT(dword, 4));
printf("AUD_CNTL_ST_C ELD_buffer_size\t\t\t\t%lu\n", BITS(dword, 14, 10));

- dword = INREG(AUD_CNTRL_ST2);
+ dword = INREG(igt_global_mmio, AUD_CNTRL_ST2);
printf("AUD_CNTRL_ST2 CP_ReadyB\t\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_CNTRL_ST2 ELD_validB\t\t\t\t%lu\n", BIT(dword, 0));
printf("AUD_CNTRL_ST2 CP_ReadyC\t\t\t\t%lu\n", BIT(dword, 5));
@@ -1179,7 +1181,7 @@ static void dump_cpt(void)
printf("AUD_CNTRL_ST2 CP_ReadyD\t\t\t\t%lu\n", BIT(dword, 9));
printf("AUD_CNTRL_ST2 ELD_validD\t\t\t\t%lu\n", BIT(dword, 8));

- dword = INREG(AUD_CNTRL_ST3);
+ dword = INREG(igt_global_mmio, AUD_CNTRL_ST3);
printf("AUD_CNTRL_ST3 TransA_DPT_Audio_Output_En\t\t%lu\n", BIT(dword, 3));
printf("AUD_CNTRL_ST3 TransA_to_Port_Sel\t\t\t[%#lx] %s\n",
BITS(dword, 2, 0), trans_to_port_sel[BITS(dword, 2, 0)]);
@@ -1190,7 +1192,7 @@ static void dump_cpt(void)
printf("AUD_CNTRL_ST3 TransC_to_Port_Sel\t\t\t[%#lx] %s\n",
BITS(dword, 10, 8), trans_to_port_sel[BITS(dword, 10, 8)]);

- dword = INREG(AUD_HDMIW_STATUS);
+ dword = INREG(igt_global_mmio, AUD_HDMIW_STATUS);
printf("AUD_HDMIW_STATUS Conv_A_CDCLK/DOTCLK_FIFO_Underrun\t%lu\n", BIT(dword, 27));
printf("AUD_HDMIW_STATUS Conv_A_CDCLK/DOTCLK_FIFO_Overrun\t%lu\n", BIT(dword, 26));
printf("AUD_HDMIW_STATUS Conv_B_CDCLK/DOTCLK_FIFO_Underrun\t%lu\n", BIT(dword, 29));
@@ -1201,54 +1203,60 @@ static void dump_cpt(void)
printf("AUD_HDMIW_STATUS Function_Reset\t\t\t%lu\n", BIT(dword, 24));

printf("AUD_HDMIW_HDMIEDID_A HDMI ELD:\n\t");
- dword = INREG(AUD_CNTL_ST_A);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_A);
dword &= ~BITMASK(9, 5);
- OUTREG(AUD_CNTL_ST_A, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST_A, dword);
for (i = 0; i < BITS(dword, 14, 10) / 4; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_HDMIEDID_A)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_HDMIEDID_A)));
printf("\n");

printf("AUD_HDMIW_HDMIEDID_B HDMI ELD:\n\t");
- dword = INREG(AUD_CNTL_ST_B);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_B);
dword &= ~BITMASK(9, 5);
- OUTREG(AUD_CNTL_ST_B, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST_B, dword);
for (i = 0; i < BITS(dword, 14, 10) / 4; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_HDMIEDID_B)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_HDMIEDID_B)));
printf("\n");

printf("AUD_HDMIW_HDMIEDID_C HDMI ELD:\n\t");
- dword = INREG(AUD_CNTL_ST_C);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_C);
dword &= ~BITMASK(9, 5);
- OUTREG(AUD_CNTL_ST_C, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST_C, dword);
for (i = 0; i < BITS(dword, 14, 10) / 4; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_HDMIEDID_C)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_HDMIEDID_C)));
printf("\n");

printf("AUD_HDMIW_INFOFR_A HDMI audio Infoframe:\n\t");
- dword = INREG(AUD_CNTL_ST_A);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_A);
dword &= ~BITMASK(20, 18);
dword &= ~BITMASK(3, 0);
- OUTREG(AUD_CNTL_ST_A, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST_A, dword);
for (i = 0; i < 8; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_INFOFR_A)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_INFOFR_A)));
printf("\n");

printf("AUD_HDMIW_INFOFR_B HDMI audio Infoframe:\n\t");
- dword = INREG(AUD_CNTL_ST_B);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_B);
dword &= ~BITMASK(20, 18);
dword &= ~BITMASK(3, 0);
- OUTREG(AUD_CNTL_ST_B, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST_B, dword);
for (i = 0; i < 8; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_INFOFR_B)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_INFOFR_B)));
printf("\n");

printf("AUD_HDMIW_INFOFR_C HDMI audio Infoframe:\n\t");
- dword = INREG(AUD_CNTL_ST_C);
+ dword = INREG(igt_global_mmio, AUD_CNTL_ST_C);
dword &= ~BITMASK(20, 18);
dword &= ~BITMASK(3, 0);
- OUTREG(AUD_CNTL_ST_C, dword);
+ OUTREG(igt_global_mmio, AUD_CNTL_ST_C, dword);
for (i = 0; i < 8; i++)
- printf("%08x ", htonl(INREG(AUD_HDMIW_INFOFR_C)));
+ printf("%08x ", htonl(INREG(igt_global_mmio,
+ AUD_HDMIW_INFOFR_C)));
printf("\n");

}
@@ -1374,10 +1382,12 @@ static void dump_aud_config(int index)
char prefix[MAX_PREFIX_SIZE];

if (!IS_HASWELL_PLUS(devid)) {
- dword = INREG(aud_reg_base + AUD_CONFIG_A + (index - PIPE_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_CONFIG_A +
+ (index - PIPE_A) * 0x100);
sprintf(prefix, "AUD_CONFIG_%c ", 'A' + index - PIPE_A);
} else {
- dword = INREG(aud_reg_base + AUD_TCA_CONFIG + (index - TRANSCODER_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_TCA_CONFIG +
+ (index - TRANSCODER_A) * 0x100);
sprintf(prefix, "AUD_TC%c_CONFIG", 'A' + index - TRANSCODER_A);
}

@@ -1397,10 +1407,12 @@ static void dump_aud_misc_control(int index)
char prefix[MAX_PREFIX_SIZE];

if (!IS_HASWELL_PLUS(devid)) {
- dword = INREG(aud_reg_base + AUD_MISC_CTRL_A + (index - PIPE_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_MISC_CTRL_A +
+ (index - PIPE_A) * 0x100);
sprintf(prefix, "AUD_MISC_CTRL_%c ", 'A' + index - PIPE_A);
} else {
- dword = INREG(aud_reg_base + AUD_C1_MISC_CTRL + (index - CONVERTER_1) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_C1_MISC_CTRL +
+ (index - CONVERTER_1) * 0x100);
sprintf(prefix, "AUD_C%c_MISC_CTRL", '1' + index - CONVERTER_1);
}

@@ -1414,7 +1426,7 @@ static void dump_aud_vendor_device_id(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_VID_DID);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_VID_DID);
printf("AUD_VID_DID device id\t\t\t\t\t0x%lx\n", BITS(dword, 15, 0));
printf("AUD_VID_DID vendor id\t\t\t\t\t0x%lx\n", BITS(dword, 31, 16));
}
@@ -1423,7 +1435,7 @@ static void dump_aud_revision_id(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_RID);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_RID);
printf("AUD_RID Stepping_Id\t\t\t\t\t0x%lx\n", BITS(dword, 7, 0));
printf("AUD_RID Revision_Id\t\t\t\t\t0x%lx\n", BITS(dword, 15, 8));
printf("AUD_RID Minor_Revision\t\t\t\t\t0x%lx\n", BITS(dword, 19, 16));
@@ -1436,10 +1448,13 @@ static void dump_aud_m_cts_enable(int index)
char prefix[MAX_PREFIX_SIZE];

if (!IS_HASWELL_PLUS(devid)) {
- dword = INREG(aud_reg_base + AUD_CTS_ENABLE_A + (index - PIPE_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_CTS_ENABLE_A +
+ (index - PIPE_A) * 0x100);
sprintf(prefix, "AUD_CTS_ENABLE_%c ", 'A' + index - PIPE_A);
} else {
- dword = INREG(aud_reg_base + AUD_TCA_M_CTS_ENABLE + (index - TRANSCODER_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_TCA_M_CTS_ENABLE + (index - TRANSCODER_A) *
+ 0x100);
sprintf(prefix, "AUD_TC%c_M_CTS_ENABLE", 'A' + index - TRANSCODER_A);
}

@@ -1454,7 +1469,7 @@ static void dump_aud_power_state(void)
uint32_t dword;
int num_pipes;

- dword = INREG(aud_reg_base + AUD_PWRST);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_PWRST);
printf("AUD_PWRST PinB_Widget_Power_State_Set \t%s\n", power_state[BITS(dword, 1, 0)]);
printf("AUD_PWRST PinB_Widget_Power_State_Current \t%s\n", power_state[BITS(dword, 3, 2)]);
printf("AUD_PWRST PinC_Widget_Power_State_Set \t%s\n", power_state[BITS(dword, 5, 4)]);
@@ -1510,11 +1525,11 @@ static void dump_aud_edid_data(int index)
printf("AUD_HDMIW_HDMIEDID_%c HDMI ELD:\n\t", 'A' + index - PIPE_A);
}

- dword = INREG(aud_ctrl_st);
+ dword = INREG(igt_global_mmio, aud_ctrl_st);
dword &= ~BITMASK(9, 5);
- OUTREG(aud_ctrl_st, dword);
+ OUTREG(igt_global_mmio, aud_ctrl_st, dword);
for (i = 0; i < BITS(dword, 14, 10) / 4; i++)
- printf("%08x ", htonl(INREG(edid_data)));
+ printf("%08x ", htonl(INREG(igt_global_mmio, edid_data)));
printf("\n");
}

@@ -1537,12 +1552,12 @@ static void dump_aud_infoframe(int index)
printf("AUD_HDMIW_INFOFR_%c HDMI audio Infoframe:\n\t", 'A' + index - PIPE_A);
}

- dword = INREG(aud_ctrl_st);
+ dword = INREG(igt_global_mmio, aud_ctrl_st);
dword &= ~BITMASK(20, 18);
dword &= ~BITMASK(3, 0);
- OUTREG(aud_ctrl_st, dword);
+ OUTREG(igt_global_mmio, aud_ctrl_st, dword);
for (i = 0; i < 8; i++)
- printf("%08x ", htonl(INREG(info_frm)));
+ printf("%08x ", htonl(INREG(igt_global_mmio, info_frm)));
printf("\n");
}

@@ -1551,7 +1566,7 @@ static void dump_aud_port_en_hd_cfg(void)
uint32_t dword;
int num_pipes = get_num_pipes();

- dword = INREG(aud_reg_base + AUD_PORT_EN_HD_CFG);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_PORT_EN_HD_CFG);
if (num_pipes == 2) {
printf("AUD_PORT_EN_HD_CFG Convertor_A_Digen\t\t\t%lu\n", BIT(dword, 0));
printf("AUD_PORT_EN_HD_CFG Convertor_B_Digen\t\t\t%lu\n", BIT(dword, 1));
@@ -1585,7 +1600,7 @@ static void dump_aud_pipe_conv_cfg(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_PIPE_CONV_CFG);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_PIPE_CONV_CFG);
printf("AUD_PIPE_CONV_CFG Convertor_1_Digen\t\t\t%lu\n", BIT(dword, 0));
printf("AUD_PIPE_CONV_CFG Convertor_2_Digen\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_PIPE_CONV_CFG Convertor_3_Digen\t\t\t%lu\n", BIT(dword, 2));
@@ -1607,10 +1622,12 @@ static void dump_aud_dig_cnvt(int index)
char prefix[MAX_PREFIX_SIZE];

if (!IS_HASWELL_PLUS(devid)) {
- dword = INREG(aud_reg_base + AUD_OUT_DIG_CNVT_A + (index - PIPE_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_OUT_DIG_CNVT_A + (index - PIPE_A) * 0x100);
sprintf(prefix, "AUD_OUT_DIG_CNVT_%c", 'A' + index - PIPE_A);
} else {
- dword = INREG(aud_reg_base + AUD_C1_DIG_CNVT + (index - CONVERTER_1) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_C1_DIG_CNVT +
+ (index - CONVERTER_1) * 0x100);
sprintf(prefix, "AUD_C%c_DIG_CNVT ", '1' + index - CONVERTER_1);
}

@@ -1633,10 +1650,12 @@ static void dump_aud_str_desc(int index)
uint32_t rate;

if (!IS_HASWELL_PLUS(devid)) {
- dword = INREG(aud_reg_base + AUD_OUT_STR_DESC_A + (index - PIPE_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_OUT_STR_DESC_A + (index - PIPE_A) * 0x100);
sprintf(prefix, "AUD_OUT_STR_DESC_%c", 'A' + index - PIPE_A);
} else {
- dword = INREG(aud_reg_base + AUD_C1_STR_DESC + (index - CONVERTER_1) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_C1_STR_DESC +
+ (index - CONVERTER_1) * 0x100);
sprintf(prefix, "AUD_C%c_STR_DESC ", '1' + index - CONVERTER_1);
}

@@ -1668,8 +1687,9 @@ static void dump_aud_out_chan_map(void)

printf("AUD_OUT_CHAN_MAP Converter_Channel_MAP PORTB PORTC PORTD\n");
for (i = 0; i < 8; i++) {
- OUTREG(aud_reg_base + AUD_OUT_CHAN_MAP, i | (i << 8) | (i << 16));
- dword = INREG(aud_reg_base + AUD_OUT_CHAN_MAP);
+ OUTREG(igt_global_mmio, aud_reg_base + AUD_OUT_CHAN_MAP,
+ i | (i << 8) | (i << 16));
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_OUT_CHAN_MAP);
printf("\t\t\t\t%lu\t%lu\t%lu\t%lu\n",
1 + BITS(dword, 3, 0),
1 + BITS(dword, 7, 4),
@@ -1683,7 +1703,7 @@ static void dump_aud_connect_list(void)
uint32_t dword;
char prefix[MAX_PREFIX_SIZE];

- dword = INREG(aud_reg_base + AUD_PINW_CONNLNG_LIST);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_PINW_CONNLNG_LIST);
sprintf(prefix, "AUD_PINW_CONNLNG_LIST");

printf("%s Connect_List_Length\t\t%lu\n", prefix, BITS(dword, 6, 0));
@@ -1698,11 +1718,13 @@ static void dump_aud_connect_select(void)
char prefix[MAX_PREFIX_SIZE];

if (IS_HASWELL_PLUS(devid)) {
- dword = INREG(aud_reg_base + AUD_PIPE_CONN_SEL_CTRL);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_PIPE_CONN_SEL_CTRL);
sprintf(prefix, "AUD_PIPE_CONN_SEL_CTRL");

} else {
- dword = INREG(aud_reg_base + AUD_PINW_CONNLNG_SEL);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_PINW_CONNLNG_SEL);
sprintf(prefix, "AUD_PINW_CONNLNG_SEL ");
}

@@ -1718,11 +1740,13 @@ static void dump_aud_ctrl_state(int index)

if (IS_HASWELL_PLUS(devid)) {
offset = (index - TRANSCODER_A) * 0x100;
- dword = INREG(aud_reg_base + AUD_TCA_DIP_ELD_CTRL_ST + offset);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_TCA_DIP_ELD_CTRL_ST + offset);
printf("Audio DIP and ELD control state for Transcoder %c\n", 'A' + index - TRANSCODER_A);
} else {
offset = (index - PIPE_A) * 0x100;
- dword = INREG(aud_reg_base + AUD_CNTL_ST_A + offset);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_CNTL_ST_A +
+ offset);
printf("Audio control state - Pipe %c\n", 'A' + index - PIPE_A);
}

@@ -1743,7 +1767,7 @@ static void dump_aud_ctrl_state2(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_CNTL_ST2);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_CNTL_ST2);
printf("AUD_CNTL_ST2 ELD_validB\t\t\t\t%lu\n", BIT(dword, 0));
printf("AUD_CNTL_ST2 CP_ReadyB\t\t\t\t\t%lu\n", BIT(dword, 1));
printf("AUD_CNTL_ST2 ELD_validC\t\t\t\t%lu\n", BIT(dword, 4));
@@ -1757,7 +1781,7 @@ static void dump_aud_eld_cp_vld(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_PIN_ELD_CP_VLD);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_PIN_ELD_CP_VLD);
printf("AUD_PIN_ELD_CP_VLD Transcoder_A ELD_valid\t\t%lu\n", BIT(dword, 0));
printf("AUD_PIN_ELD_CP_VLD Transcoder_A CP_Ready \t\t%lu\n", BIT(dword, 1));
printf("AUD_PIN_ELD_CP_VLD Transcoder_A Out_enable\t\t%lu\n", BIT(dword, 2));
@@ -1776,7 +1800,7 @@ static void dump_aud_hdmi_status(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_HDMIW_STATUS);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_HDMIW_STATUS);
printf("AUD_HDMIW_STATUS Function_Reset\t\t\t%lu\n", BIT(dword, 24));
printf("AUD_HDMIW_STATUS BCLK/CDCLK_FIFO_Overrun\t\t%lu\n", BIT(dword, 25));
printf("AUD_HDMIW_STATUS Conv_A_CDCLK/DOTCLK_FIFO_Overrun\t%lu\n", BIT(dword, 28));
@@ -1817,7 +1841,7 @@ static void dump_dp_port_ctrl(int port)
sprintf(prefix, "DP_%c", 'B' + port - PORT_B);

port_ctrl = disp_reg_base + DP_CTL_B + (port - PORT_B) * 0x100;
- dword = INREG(port_ctrl);
+ dword = INREG(igt_global_mmio, port_ctrl);
printf("%s DisplayPort_Enable\t\t\t\t\t%lu\n", prefix, BIT(dword, 31));
printf("%s Transcoder_Select\t\t\t\t\t%s\n", prefix, BIT(dword, 30) ? "Transcoder B" : "Transcoder A");
printf("%s Port_Width_Selection\t\t\t\t[0x%lx] %s\n", prefix, BITS(dword, 21, 19),
@@ -1841,7 +1865,7 @@ static void dump_hdmi_port_ctrl(int port)
port_ctrl = disp_reg_base + HDMI_CTL_B + (port - PORT_B) * 0x10;
}

- dword = INREG(port_ctrl);
+ dword = INREG(igt_global_mmio, port_ctrl);
printf("%s HDMI_Enable\t\t\t\t\t%u\n", prefix, !!(dword & SDVO_ENABLE));
printf("%s Transcoder_Select\t\t\t\t%s\n", prefix, BIT(dword, 30) ? "Transcoder B" : "Transcoder A");
printf("%s HDCP_Port_Select\t\t\t\t%lu\n", prefix, BIT(dword, 5));
@@ -2029,7 +2053,7 @@ static void dump_ddi_buf_ctl(int port)
{
uint32_t dword;

- dword = INREG(DDI_BUF_CTL_A + (port - PORT_A) * 0x100);
+ dword = INREG(igt_global_mmio, DDI_BUF_CTL_A + (port - PORT_A) * 0x100);
printf("DDI %c Buffer control\n", 'A' + port - PORT_A);

printf("\tDP port width\t\t\t\t\t[0x%lx] %s\n", BITS(dword, 3, 1),
@@ -2041,7 +2065,8 @@ static void dump_ddi_func_ctl(int pipe)
{
uint32_t dword;

- dword = INREG(PIPE_DDI_FUNC_CTL_A + (pipe - PIPE_A) * 0x1000);
+ dword = INREG(igt_global_mmio, PIPE_DDI_FUNC_CTL_A + (pipe - PIPE_A) *
+ 0x1000);
printf("Pipe %c DDI Function Control\n", 'A' + pipe - PIPE_A);

printf("\tBITS per color\t\t\t\t\t[0x%lx] %s\n", BITS(dword, 22, 20),
@@ -2058,7 +2083,8 @@ static void dump_aud_connect_list_entry_length(int transcoder)
uint32_t dword;
char prefix[MAX_PREFIX_SIZE];

- dword = INREG(aud_reg_base + AUD_TCA_PIN_PIPE_CONN_ENTRY_LNGTH + (transcoder - TRANSCODER_A) * 0x100);
+ dword = INREG(igt_global_mmio, aud_reg_base +
+ AUD_TCA_PIN_PIPE_CONN_ENTRY_LNGTH + (transcoder - TRANSCODER_A) * 0x100);
sprintf(prefix, "AUD_TC%c_PIN_PIPE_CONN_ENTRY_LNGTH", 'A' + transcoder - TRANSCODER_A);

printf("%s Connect_List_Length\t%lu\n", prefix, BITS(dword, 6, 0));
@@ -2071,7 +2097,7 @@ static void dump_aud_connect_select_ctrl(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_PIPE_CONN_SEL_CTRL);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_PIPE_CONN_SEL_CTRL);
printf("AUD_PIPE_CONN_SEL_CTRL Connection_select_Port_B\t%#lx\n", BITS(dword, 7, 0));
printf("AUD_PIPE_CONN_SEL_CTRL Connection_select_Port_C\t%#lx\n", BITS(dword, 15, 8));
printf("AUD_PIPE_CONN_SEL_CTRL Connection_select_Port_D\t%#lx\n", BITS(dword, 23, 16));
@@ -2082,7 +2108,8 @@ static void dump_aud_dip_eld_ctrl_st(int transcoder)
uint32_t dword;
int offset = (transcoder - TRANSCODER_A) * 0x100;

- dword = INREG(aud_reg_base + AUD_TCA_DIP_ELD_CTRL_ST + offset);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_TCA_DIP_ELD_CTRL_ST +
+ offset);
printf("Audio DIP and ELD control state for Transcoder %c\n", 'A' + transcoder - TRANSCODER_A);

printf("\tELD_ACK\t\t\t\t\t\t%lu\n", BIT(dword, 4));
@@ -2102,7 +2129,7 @@ static void dump_aud_hdmi_fifo_status(void)
{
uint32_t dword;

- dword = INREG(aud_reg_base + AUD_HDMI_FIFO_STATUS);
+ dword = INREG(igt_global_mmio, aud_reg_base + AUD_HDMI_FIFO_STATUS);
printf("AUD_HDMI_FIFO_STATUS Function_Reset\t\t\t%lu\n", BIT(dword, 24));
printf("AUD_HDMI_FIFO_STATUS Conv_1_CDCLK/DOTCLK_FIFO_Overrun\t%lu\n", BIT(dword, 26));
printf("AUD_HDMI_FIFO_STATUS Conv_1_CDCLK/DOTCLK_FIFO_Underrun\t%lu\n", BIT(dword, 27));
diff --git a/tools/intel_backlight.c b/tools/intel_backlight.c
index 067fd418..bdbf9af3 100644
--- a/tools/intel_backlight.c
+++ b/tools/intel_backlight.c
@@ -42,8 +42,8 @@ int main(int argc, char** argv)

intel_mmio_use_pci_bar(intel_get_pci_device());

- current = INREG(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
- max = INREG(BLC_PWM_PCH_CTL2) >> 16;
+ current = INREG(igt_global_mmio, BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
+ max = INREG(igt_global_mmio, BLC_PWM_PCH_CTL2) >> 16;

printf ("current backlight value: %d%%\n", current * 100 / max);

@@ -51,9 +51,9 @@ int main(int argc, char** argv)
uint32_t v = atoi (argv[1]) * max / 100;
if (v > max)
v = max;
- OUTREG(BLC_PWM_CPU_CTL,
- (INREG(BLC_PWM_CPU_CTL) &~ BACKLIGHT_DUTY_CYCLE_MASK) | v);
- (void) INREG(BLC_PWM_CPU_CTL);
+ OUTREG(igt_global_mmio, BLC_PWM_CPU_CTL,
+ (INREG(igt_global_mmio, BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK) | v);
+ (void)INREG(igt_global_mmio, BLC_PWM_CPU_CTL);
printf ("set backlight to %d%%\n", v * 100 / max);
}

diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c
index 51f5b9a5..e1094d39 100644
--- a/tools/intel_display_poller.c
+++ b/tools/intel_display_poller.c
@@ -71,22 +71,22 @@ static void sighandler(int x)

static uint16_t read_reg_16(uint32_t reg)
{
- return INREG16(vlv_offset + reg);
+ return INREG16(igt_global_mmio, vlv_offset + reg);
}

static uint32_t read_reg(uint32_t reg)
{
- return INREG(vlv_offset + reg);
+ return INREG(igt_global_mmio, vlv_offset + reg);
}

static void write_reg_16(uint32_t reg, uint16_t val)
{
- OUTREG16(vlv_offset + reg, val);
+ OUTREG16(igt_global_mmio, vlv_offset + reg, val);
}

static void write_reg(uint32_t reg, uint32_t val)
{
- OUTREG(vlv_offset + reg, val);
+ OUTREG(igt_global_mmio, vlv_offset + reg, val);
}

static char pipe_name(int pipe)
diff --git a/tools/intel_gpu_time.c b/tools/intel_gpu_time.c
index 56d65fe0..79240fd3 100644
--- a/tools/intel_gpu_time.c
+++ b/tools/intel_gpu_time.c
@@ -86,8 +86,10 @@ int main(int argc, char **argv)
while (!goddo) {
uint32_t ring_head, ring_tail;

- ring_head = INREG(LP_RING + RING_HEAD) & HEAD_ADDR;
- ring_tail = INREG(LP_RING + RING_TAIL) & TAIL_ADDR;
+ ring_head = INREG(igt_global_mmio, LP_RING + RING_HEAD) &
+ HEAD_ADDR;
+ ring_tail = INREG(igt_global_mmio, LP_RING + RING_TAIL) &
+ TAIL_ADDR;

if (ring_tail == ring_head)
ring_idle++;
diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c
index 2ef5d4fd..689f5faa 100644
--- a/tools/intel_infoframes.c
+++ b/tools/intel_infoframes.c
@@ -337,20 +337,20 @@ static void load_infoframe(Transcoder transcoder, DipInfoFrame *frame,
uint32_t ctl_val;
uint32_t i;

- ctl_val = INREG(ctl_reg);
+ ctl_val = INREG(igt_global_mmio, ctl_reg);

ctl_val &= ~DIP_CTL_BUFFER_INDEX;
ctl_val |= type << 19;
- OUTREG(ctl_reg, ctl_val);
- ctl_val = INREG(ctl_reg);
+ OUTREG(igt_global_mmio, ctl_reg, ctl_val);
+ ctl_val = INREG(igt_global_mmio, ctl_reg);

ctl_val &= ~DIP_CTL_ACCESS_ADDR;
- OUTREG(ctl_reg, ctl_val);
+ OUTREG(igt_global_mmio, ctl_reg, ctl_val);

for (i = 0; i < 16; i++) {
- ctl_val = INREG(ctl_reg);
+ ctl_val = INREG(igt_global_mmio, ctl_reg);
assert((ctl_val & DIP_CTL_ACCESS_ADDR) == i);
- frame->data32[i] = INREG(data_reg);
+ frame->data32[i] = INREG(igt_global_mmio, data_reg);
}
}

@@ -385,7 +385,7 @@ static void infoframe_fix_checksum(DipInfoFrame *frame)
static void dump_port_info(int hdmi_port_index)
{
Register port = get_hdmi_port(hdmi_port_index);
- uint32_t val = INREG(port);
+ uint32_t val = INREG(igt_global_mmio, port);
Transcoder transcoder;

printf("\nPort %s:\n", hdmi_port_names[hdmi_port_index]);
@@ -438,7 +438,7 @@ static void dump_avi_info(Transcoder transcoder)
DipInfoFrame frame;

load_infoframe(transcoder, &frame, DIP_AVI);
- val = INREG(reg);
+ val = INREG(igt_global_mmio, reg);

printf("AVI InfoFrame:\n");

@@ -537,7 +537,7 @@ static void dump_vendor_info(Transcoder transcoder)
DipInfoFrame frame;

load_infoframe(transcoder, &frame, DIP_VENDOR);
- val = INREG(reg);
+ val = INREG(igt_global_mmio, reg);

printf("Vendor InfoFrame:\n");

@@ -572,7 +572,7 @@ static void dump_gamut_info(Transcoder transcoder)
DipInfoFrame frame;

load_infoframe(transcoder, &frame, DIP_GAMUT);
- val = INREG(reg);
+ val = INREG(igt_global_mmio, reg);

printf("Gamut InfoFrame:\n");

@@ -600,7 +600,7 @@ static void dump_spd_info(Transcoder transcoder)
char description[17];

load_infoframe(transcoder, &frame, DIP_SPD);
- val = INREG(reg);
+ val = INREG(igt_global_mmio, reg);

printf("SPD InfoFrame:\n");

@@ -635,7 +635,7 @@ static void dump_spd_info(Transcoder transcoder)
static void dump_transcoder_info(Transcoder transcoder)
{
Register reg = get_dip_ctl_reg(transcoder);
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);

if (gen == 4) {
printf("\nDIP information:\n");
@@ -698,37 +698,37 @@ static void write_infoframe(Transcoder transcoder, DipType type,
uint32_t ctl_val;
unsigned int i;

- ctl_val = INREG(ctl_reg);
+ ctl_val = INREG(igt_global_mmio, ctl_reg);
ctl_val &= ~DIP_CTL_BUFFER_INDEX;
ctl_val |= (type << 19);
ctl_val &= ~DIP_CTL_ACCESS_ADDR;
- OUTREG(ctl_reg, ctl_val);
+ OUTREG(igt_global_mmio, ctl_reg, ctl_val);

for (i = 0; i < 8; i++) {
- ctl_val = INREG(ctl_reg);
+ ctl_val = INREG(igt_global_mmio, ctl_reg);
assert((ctl_val & DIP_CTL_ACCESS_ADDR) == i);
- OUTREG(data_reg, frame->data32[i]);
+ OUTREG(igt_global_mmio, data_reg, frame->data32[i]);
}
}

static void disable_infoframe(Transcoder transcoder, DipType type)
{
Register reg = get_dip_ctl_reg(transcoder);
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);
if (gen != 4 && type == DIP_AVI)
val &= ~DIP_CTL_ENABLE;
val &= ~(1 << (21 + type));
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static void enable_infoframe(Transcoder transcoder, DipType type)
{
Register reg = get_dip_ctl_reg(transcoder);
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);
if (gen != 4 && type == DIP_AVI)
val |= DIP_CTL_ENABLE;
val |= (1 << (21 + type));
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static int parse_infoframe_option_u(const char *name, const char *s,
@@ -787,7 +787,7 @@ static void change_avi_infoframe(Transcoder transcoder, char *commands)
char *current = commands;

load_infoframe(transcoder, &frame, DIP_AVI);
- val = INREG(reg);
+ val = INREG(igt_global_mmio, reg);

while (1) {
rc = sscanf(current, "%31s%n", option, &read);
@@ -856,7 +856,7 @@ static void change_avi_infoframe(Transcoder transcoder, char *commands)

val &= ~DIP_CTL_FREQUENCY;
val |= DIP_CTL_FREQ_EVERY;
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);

frame.avi.header.type = AVI_INFOFRAME_TYPE;
frame.avi.header.version = AVI_INFOFRAME_VERSION;
@@ -888,7 +888,7 @@ static void change_spd_infoframe(Transcoder transcoder, char *commands)
char *current = commands;

load_infoframe(transcoder, &frame, DIP_SPD);
- val = INREG(reg);
+ val = INREG(igt_global_mmio, reg);

while (1) {
rc = sscanf(current, "%15s%n", option, &read);
@@ -917,7 +917,7 @@ static void change_spd_infoframe(Transcoder transcoder, char *commands)

val &= ~DIP_CTL_FREQUENCY;
val |= DIP_CTL_FREQ_EVERY_OTHER;
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);

frame.spd.header.type = SPD_INFOFRAME_TYPE;
frame.spd.header.version = SPD_INFOFRAME_VERSION;
@@ -946,7 +946,7 @@ static void change_infoframe_frequency(Transcoder transcoder, DipType type,
DipFrequency frequency)
{
Register reg = get_dip_ctl_reg(transcoder);
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);

if (type == DIP_AVI && frequency != DIP_FREQ_EVERY_VSYNC) {
printf("Error: AVI infoframe must be sent every VSync!\n");
@@ -955,37 +955,37 @@ static void change_infoframe_frequency(Transcoder transcoder, DipType type,

val &= ~DIP_CTL_FREQUENCY;
val |= (frequency << 16);
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static void disable_dip(Transcoder transcoder)
{
Register reg = get_dip_ctl_reg(transcoder);
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);
val &= ~DIP_CTL_ENABLE;
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static void enable_dip(Transcoder transcoder)
{
Register reg = get_dip_ctl_reg(transcoder);
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);
val |= DIP_CTL_ENABLE;
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static void disable_hdmi_port(Register reg)
{
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);
val &= ~HDMI_PORT_ENABLE;
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static void enable_hdmi_port(Register reg)
{
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);
val |= HDMI_PORT_ENABLE;
- OUTREG(reg, val);
+ OUTREG(igt_global_mmio, reg, val);
}

static void print_usage(void)
diff --git a/tools/intel_lid.c b/tools/intel_lid.c
index 37c6ba5e..2b597efb 100644
--- a/tools/intel_lid.c
+++ b/tools/intel_lid.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
intel_mmio_use_pci_bar(intel_get_pci_device());

while (1) {
- swf14 = INREG(SWF14);
+ swf14 = INREG(igt_global_mmio, SWF14);

printf("Intel LVDS Lid status:\n");
printf("\tSWF14(0x%x) : %s\n", swf14,
diff --git a/tools/intel_panel_fitter.c b/tools/intel_panel_fitter.c
index 137ef61a..26843d7c 100644
--- a/tools/intel_panel_fitter.c
+++ b/tools/intel_panel_fitter.c
@@ -84,12 +84,12 @@ static void read_pipe_info(int intel_pipe, struct pipe_info *info)
{
uint32_t conf, vtotal, htotal, src, ctrl1, win_sz;

- conf = INREG(PIPECONF[intel_pipe]);
- htotal = INREG(HTOTAL[intel_pipe]);
- vtotal = INREG(VTOTAL[intel_pipe]);
- src = INREG(PIPESRC[intel_pipe]);
- ctrl1 = INREG(PF_CTRL1[intel_pipe]);
- win_sz = INREG(PF_WIN_SZ[intel_pipe]);
+ conf = INREG(igt_global_mmio, PIPECONF[intel_pipe]);
+ htotal = INREG(igt_global_mmio, HTOTAL[intel_pipe]);
+ vtotal = INREG(igt_global_mmio, VTOTAL[intel_pipe]);
+ src = INREG(igt_global_mmio, PIPESRC[intel_pipe]);
+ ctrl1 = INREG(igt_global_mmio, PF_CTRL1[intel_pipe]);
+ win_sz = INREG(igt_global_mmio, PF_WIN_SZ[intel_pipe]);

info->enabled = (conf & PIPECONF_ENABLE) ? true : false;
info->tot_width = (htotal & HTOTAL_ACTIVE_MASK) + 1;
@@ -232,24 +232,24 @@ static int change_screen_size(int intel_pipe, int x, int y)
assert(0);
}
}
- OUTREG(PF_CTRL1[intel_pipe], ctrl1_val);
+ OUTREG(igt_global_mmio, PF_CTRL1[intel_pipe], ctrl1_val);

win_pos_val = pos_x << 16;
win_pos_val |= pos_y;
- OUTREG(PF_WIN_POS[intel_pipe], win_pos_val);
+ OUTREG(igt_global_mmio, PF_WIN_POS[intel_pipe], win_pos_val);

win_sz_val = dst_width << 16;
win_sz_val |= dst_height;
- OUTREG(PF_WIN_SZ[intel_pipe], win_sz_val);
+ OUTREG(igt_global_mmio, PF_WIN_SZ[intel_pipe], win_sz_val);

return 0;
}

static int disable_panel_fitter(int intel_pipe)
{
- OUTREG(PF_CTRL1[intel_pipe], 0);
- OUTREG(PF_WIN_POS[intel_pipe], 0);
- OUTREG(PF_WIN_SZ[intel_pipe], 0);
+ OUTREG(igt_global_mmio, PF_CTRL1[intel_pipe], 0);
+ OUTREG(igt_global_mmio, PF_WIN_POS[intel_pipe], 0);
+ OUTREG(igt_global_mmio, PF_WIN_SZ[intel_pipe], 0);
return 0;
}

diff --git a/tools/intel_reg.c b/tools/intel_reg.c
index 1247b70b..2e74b601 100644
--- a/tools/intel_reg.c
+++ b/tools/intel_reg.c
@@ -364,7 +364,8 @@ static int read_register(struct config *config, struct reg *reg, uint32_t *valp)
if (reg->engine)
val = register_srm(config, reg, NULL);
else
- val = INREG(reg->mmio_offset + reg->addr);
+ val = INREG(igt_global_mmio,
+ reg->mmio_offset + reg->addr);
break;
case PORT_PORTIO_VGA:
iopl(3);
@@ -372,7 +373,7 @@ static int read_register(struct config *config, struct reg *reg, uint32_t *valp)
iopl(0);
break;
case PORT_MMIO_VGA:
- val = INREG8(reg->addr);
+ val = INREG8(igt_global_mmio, reg->addr);
break;
case PORT_BUNIT:
case PORT_PUNIT:
@@ -424,7 +425,8 @@ static int write_register(struct config *config, struct reg *reg, uint32_t val)
if (reg->engine) {
register_srm(config, reg, &val);
} else {
- OUTREG(reg->mmio_offset + reg->addr, val);
+ OUTREG(igt_global_mmio,
+ reg->mmio_offset + reg->addr, val);
}
break;
case PORT_PORTIO_VGA:
@@ -443,7 +445,7 @@ static int write_register(struct config *config, struct reg *reg, uint32_t val)
val, reg->port_desc.name);
return -1;
}
- OUTREG8(reg->addr, val);
+ OUTREG8(igt_global_mmio, reg->addr, val);
break;
case PORT_BUNIT:
case PORT_PUNIT:
diff --git a/tools/intel_reg_checker.c b/tools/intel_reg_checker.c
index 6bde63ec..b14a06ea 100644
--- a/tools/intel_reg_checker.c
+++ b/tools/intel_reg_checker.c
@@ -35,7 +35,7 @@ static int gen;
static uint32_t
read_and_print_reg(const char *name, uint32_t reg)
{
- uint32_t val = INREG(reg);
+ uint32_t val = INREG(igt_global_mmio, reg);

printf("%s (0x%x): 0x%08x\n", name, reg, val);

diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c
index e71c3d9c..00bdd120 100644
--- a/tools/intel_watermark.c
+++ b/tools/intel_watermark.c
@@ -38,7 +38,7 @@ static uint32_t devid;

static uint32_t read_reg(uint32_t addr)
{
- return INREG(display_base + addr);
+ return INREG(igt_global_mmio, display_base + addr);
}

struct gmch_wm {