diff options
| -rw-r--r-- | src/i810_reg.h | 1 | ||||
| -rw-r--r-- | src/reg_dumper/Makefile.am | 8 | ||||
| -rw-r--r-- | src/reg_dumper/reg_dumper.h | 1 | ||||
| -rw-r--r-- | src/reg_dumper/statuspage.c | 81 | ||||
| -rw-r--r-- | src/reg_dumper/util.c | 86 |
5 files changed, 176 insertions, 1 deletions
diff --git a/src/i810_reg.h b/src/i810_reg.h index 279677c7..d8e0cb2c 100644 --- a/src/i810_reg.h +++ b/src/i810_reg.h @@ -491,6 +491,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - new bits for i810 * - new register hwstam (mask) */ +#define HWS_PGA 0x2080 #define PWRCTXA 0x2088 /* 965GM+ only */ #define PWRCTX_EN (1<<0) #define HWSTAM 0x2098 /* p290 */ diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am index b840b244..1c8db204 100644 --- a/src/reg_dumper/Makefile.am +++ b/src/reg_dumper/Makefile.am @@ -1,4 +1,4 @@ -noinst_PROGRAMS = intel_reg_dumper intel_idle intel_stepping +noinst_PROGRAMS = intel_reg_dumper intel_idle intel_stepping intel_statuspage intel_reg_dumper_SOURCES = \ main.c \ @@ -15,9 +15,15 @@ intel_idle_SOURCES = \ intel_stepping_SOURCES = \ stepping.c +intel_statuspage_SOURCES = \ + statuspage.c \ + reg_dumper.h \ + util.c + intel_reg_dumper_LDADD = $(PCIACCESS_LIBS) intel_idle_LDADD = $(PCIACCESS_LIBS) intel_stepping_LDADD = $(PCIACCESS_LIBS) +intel_statuspage_LDADD = $(PCIACCESS_LIBS) AM_CFLAGS = $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \ -I$(srcdir)/.. -DREG_DUMPER diff --git a/src/reg_dumper/reg_dumper.h b/src/reg_dumper/reg_dumper.h index 9a723b9b..241b2419 100644 --- a/src/reg_dumper/reg_dumper.h +++ b/src/reg_dumper/reg_dumper.h @@ -88,3 +88,4 @@ typedef struct _scrn { char *XNFprintf(const char *format, ...); void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...); void i830DumpRegs(ScrnInfoPtr pScrn); +void intel_i830rec_init(I830Ptr pI830); diff --git a/src/reg_dumper/statuspage.c b/src/reg_dumper/statuspage.c new file mode 100644 index 00000000..d6106a5a --- /dev/null +++ b/src/reg_dumper/statuspage.c @@ -0,0 +1,81 @@ +/* + * Copyright © 2007 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Eric Anholt <eric@anholt.net> + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <sys/types.h> +#include <sys/mman.h> +#include <pciaccess.h> +#include <err.h> +#include <unistd.h> +#include <fcntl.h> + +#include "reg_dumper.h" +#include "../i810_reg.h" + +int main(int argc, char **argv) +{ + I830Rec i830; + I830Ptr pI830 = &i830; + int devmem; + uint32_t hws_offset; + volatile uint32_t *hws; + + intel_i830rec_init(pI830); + + if (HWS_NEED_GFX(pI830)) + errx(1, "status page in graphics virtual unsupported.\n"); + + hws_offset = INREG(HWS_PGA); + + devmem = open("/dev/mem", O_RDWR, 0); + if (devmem == -1) + err(1, "Couldn't open /dev/mem"); + + hws = mmap(NULL, 4096, PROT_READ, MAP_SHARED, devmem, hws_offset); + if (hws == MAP_FAILED) + err(1, "Couldn't map /dev/mem at 0x%08x", hws_offset); + + close(devmem); + + for (;;) { + int i; + + printf("\n"); + + for (i = 0; i < 64; i += 4) { + printf("0x%04x: 0x%08x 0x%08x 0x%08x 0x%08x\n", i * 4, + hws[i], hws[i + 1], hws[i + 2], hws[i + 3]); + } + + sleep(1); + } + + return 0; +} diff --git a/src/reg_dumper/util.c b/src/reg_dumper/util.c new file mode 100644 index 00000000..6dd1e487 --- /dev/null +++ b/src/reg_dumper/util.c @@ -0,0 +1,86 @@ +/* + * Copyright © 2008 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Eric Anholt <eric@anholt.net> + * + */ + +/** @file util.c + * + * Utility functions for the various tools in the reg_dumper directory. + */ + +#include <err.h> +#include <pciaccess.h> + +#include "reg_dumper.h" + +/** + * Sets up the pI830 for use by common.h-style macros, particularly + * INREG/OUTERG. + */ +void intel_i830rec_init(I830Ptr pI830) +{ + struct pci_device *dev; + int err, mmio_bar; + void *mmio; + + err = pci_system_init(); + if (err != 0) { + fprintf(stderr, "Couldn't initialize PCI system: %s\n", strerror(err)); + exit(1); + } + + /* Grab the graphics card */ + dev = pci_device_find_by_slot(0, 0, 2, 0); + if (dev == NULL) + errx(1, "Couldn't find graphics card"); + + err = pci_device_probe(dev); + if (err != 0) { + fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err)); + exit(1); + } + + if (dev->vendor_id != 0x8086) + errx(1, "Graphics card is non-intel"); + + pI830->PciInfo = &pI830->pci_info_rec; + pI830->PciInfo->chipType = dev->device_id; + + pI830->pci_dev = dev; + + mmio_bar = IS_I9XX(pI830) ? 0 : 1; + + err = pci_device_map_range (dev, + dev->regions[mmio_bar].base_addr, + dev->regions[mmio_bar].size, + PCI_DEV_MAP_FLAG_WRITABLE, + &mmio); + + if (err != 0) { + fprintf(stderr, "Couldn't map MMIO region: %s\n", strerror(err)); + exit(1); + } + pI830->mmio = mmio; +} |