diff options
| author | Eric Anholt <eric@anholt.net> | 2008-03-06 14:00:18 -0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-07-23 14:27:32 +0800 |
| commit | 202811e253be85c4415bba3eaae13508b1e2ce71 (patch) | |
| tree | 60b1f3e56479a33cbd9685be23037b6db9f9d27c | |
| parent | b9250913ab57ecade1c3011415c666e8516fce47 (diff) | |
Remove VGA regs from debug output.
(cherry picked from commit 52a414d1158aa7512fb79560dc220e2a78456a2d)
| -rw-r--r-- | src/i830_debug.c | 6 | ||||
| -rw-r--r-- | src/reg_dumper/.gitignore | 1 | ||||
| -rw-r--r-- | src/reg_dumper/Makefile.am | 9 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/i830_debug.c b/src/i830_debug.c index 856e31ac..a7f16835 100644 --- a/src/i830_debug.c +++ b/src/i830_debug.c @@ -722,6 +722,7 @@ void i830CompareRegsToSnapshot(ScrnInfoPtr pScrn, char *where) } #endif /* !REG_DUMPER */ +#if 0 static void i830DumpIndexed (ScrnInfoPtr pScrn, char *name, int id, int val, int min, int max) { I830Ptr pI830 = I830PTR(pScrn); @@ -762,6 +763,7 @@ static void i830DumpAR(ScrnInfoPtr pScrn) OUTREG8(0x3c0, orig_arx); INREG8(st01); /* switch back to index mode */ } +#endif void i830DumpRegs (ScrnInfoPtr pScrn) { @@ -773,8 +775,10 @@ void i830DumpRegs (ScrnInfoPtr pScrn) int ref; int dot; int phase; +#if 0 int msr; int crt; +#endif xf86DrvMsg (pScrn->scrnIndex, X_INFO, "DumpRegsBegin\n"); for (i = 0; i < NUM_I830_SNAPSHOTREGS; i++) { @@ -792,6 +796,7 @@ void i830DumpRegs (ScrnInfoPtr pScrn) i830_snapshot[i].name, (unsigned int)val); } } +#if 0 i830DumpIndexed (pScrn, "SR", 0x3c4, 0x3c5, 0, 7); msr = INREG8(0x3cc); xf86DrvMsg (pScrn->scrnIndex, X_INFO, "%20.20s: 0x%02x\n", @@ -803,6 +808,7 @@ void i830DumpRegs (ScrnInfoPtr pScrn) else crt = 0x3b0; i830DumpIndexed (pScrn, "CR", crt + 4, crt + 5, 0, 0x24); +#endif for (pipe = 0; pipe <= 1; pipe++) { fp = INREG(pipe == 0 ? FPA0 : FPB0); diff --git a/src/reg_dumper/.gitignore b/src/reg_dumper/.gitignore index f72a165e..b0f9b6f2 100644 --- a/src/reg_dumper/.gitignore +++ b/src/reg_dumper/.gitignore @@ -1,3 +1,4 @@ +intel_hotplug intel_idle intel_reg_dumper intel_stepping diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am index b840b244..d49a59b1 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_hotplug intel_reg_dumper_SOURCES = \ main.c \ @@ -12,9 +12,16 @@ intel_idle_SOURCES = \ xprintf.c \ ../i830_debug.c +intel_hotplug_SOURCES = \ + hotplug.c \ + reg_dumper.h \ + xprintf.c \ + ../i830_debug.c + intel_stepping_SOURCES = \ stepping.c +intel_hotplug_LDADD = $(PCIACCESS_LIBS) intel_reg_dumper_LDADD = $(PCIACCESS_LIBS) intel_idle_LDADD = $(PCIACCESS_LIBS) intel_stepping_LDADD = $(PCIACCESS_LIBS) |