xf86-video-intel: 3 commits - src/i830_cursor.c src/i830_debug.c src/i830_display.c
Eric Anholt
anholt at kemper.freedesktop.org
Mon Mar 19 22:36:32 EET 2007
src/i830_cursor.c | 3 +++
src/i830_debug.c | 13 ++++++++++++-
src/i830_display.c | 11 ++++++++++-
3 files changed, 25 insertions(+), 2 deletions(-)
New commits:
diff-tree 4c4faf260eb4dad1b1919c6168fa9ef477b98a39 (from 64c14204453bea3f98d19861c450612e718e6c69)
Author: Eric Anholt <eric at anholt.net>
Date: Mon Mar 19 13:36:37 2007 -0700
Set the CURSOR_SIZE register when present.
Failure to do so gets you a lot of pretty colors.
diff --git a/src/i830_cursor.c b/src/i830_cursor.c
index d97b246..667b0a6 100644
--- a/src/i830_cursor.c
+++ b/src/i830_cursor.c
@@ -95,6 +95,9 @@ I830InitHWCursor(ScrnInfoPtr pScrn)
DPRINTF(PFX, "I830InitHWCursor\n");
+ if (!IS_I9XX(pI830))
+ OUTREG(CURSOR_SIZE, (I810_CURSOR_Y << 12) | I810_CURSOR_X);
+
/* Initialise the HW cursor registers, leaving the cursor hidden. */
for (i = 0; i < xf86_config->num_crtc; i++)
{
diff-tree 64c14204453bea3f98d19861c450612e718e6c69 (from 3ce802414a20ca8af128a00e6925a099dd90ceb4)
Author: Eric Anholt <eric at anholt.net>
Date: Mon Mar 19 13:35:43 2007 -0700
Print the mode actually being set per pipe.
diff --git a/src/i830_display.c b/src/i830_display.c
index 98137a2..faa3781 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -870,8 +870,17 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, Dis
if (i830_panel_fitter_pipe (pI830) == pipe)
OUTREG(PFIT_CONTROL, 0);
+#if 1
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
+ xf86PrintModeline(pScrn->scrnIndex, mode);
+ if (!xf86ModesEqual(mode, adjusted_mode)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Adjusted mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
+ xf86PrintModeline(pScrn->scrnIndex, mode);
+ }
i830PrintPll("chosen", &clock);
- ErrorF("clock regs: 0x%08x, 0x%08x\n", (int)dpll, (int)fp);
+#endif
if (dpll & DPLL_VCO_ENABLE)
{
diff-tree 3ce802414a20ca8af128a00e6925a099dd90ceb4 (from c21b88d838fda1f00f6f6bcfe7855d32543c6f3f)
Author: Eric Anholt <eric at anholt.net>
Date: Mon Mar 19 11:35:11 2007 -0700
Add debug output for ADPA.
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 7fd9441..c746d35 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -254,6 +254,17 @@ DEBUGSTRING(i830_debug_dpll_test)
dpllbndiv, dpllbmdiv, dpllbinput);
}
+DEBUGSTRING(i830_debug_adpa)
+{
+ char pipe = (val & ADPA_PIPE_B_SELECT) ? 'B' : 'A';
+ char *enable = (val & ADPA_DAC_ENABLE) ? "enabled" : "disabled";
+ char hsync = (val & ADPA_HSYNC_ACTIVE_HIGH) ? '+' : '-';
+ char vsync = (val & ADPA_VSYNC_ACTIVE_HIGH) ? '+' : '-';
+
+ return XNFprintf("%s, pipe %c, %chsync, %cvsync",
+ enable, pipe, hsync, vsync);
+}
+
DEBUGSTRING(i830_debug_lvds)
{
char pipe = val & LVDS_PIPEB_SELECT ? 'B' : 'A';
@@ -313,7 +324,7 @@ static struct i830SnapshotRec {
DEFINEREG(DSPFW2),
DEFINEREG(DSPFW3),
- DEFINEREG(ADPA),
+ DEFINEREG2(ADPA, i830_debug_adpa),
DEFINEREG2(LVDS, i830_debug_lvds),
DEFINEREG(DVOA),
DEFINEREG(DVOB),
More information about the xorg-commit
mailing list