Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce the severity of many informational log messages.

This commit is contained in:
Eric Anholt 2006-11-27 11:06:50 -08:00
parent 85f404bc67
commit 5f38bc3e2a
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/i830_debug.c
View File

@ -200,7 +200,7 @@ static void i830DumpIndexed (ScrnInfoPtr pScrn, char *name, int id, int val, int
for (i = min; i <= max; i++) {
OUTREG8 (id, i);
xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "%18.18s%02x: 0x%02x\n",
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "%18.18s%02x: 0x%02x\n",
name, i, INREG8(val));
}
}
@ -218,14 +218,14 @@ void i830DumpRegs (ScrnInfoPtr pScrn)
int msr;
int crt;
xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "DumpRegsBegin\n");
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "DumpRegsBegin\n");
for (i = 0; i < NUM_I830_SNAPSHOTREGS; i++) {
xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "%20.20s: 0x%08x\n",
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "%20.20s: 0x%08x\n",
i830_snapshot[i].name, (unsigned int) INREG(i830_snapshot[i].reg));
}
i830DumpIndexed (pScrn, "SR", 0x3c4, 0x3c5, 0, 7);
msr = INREG8(0x3cc);
xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "%20.20s: 0x%02x\n",
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "%20.20s: 0x%02x\n",
"MSR", (unsigned int) msr);
if (msr & 1)
@ -285,7 +285,9 @@ void i830DumpRegs (ScrnInfoPtr pScrn)
case 6:
break;
default:
xf86DrvMsg (pScrn->scrnIndex, X_ERROR, "phase %d out of range\n", phase);
xf86DrvMsg (pScrn->scrnIndex, X_INFO,
"SDVO phase shift %d out of range -- probobly not "
"an issue.\n", phase);
break;
}
switch ((dpll >> 8) & 1) {
@ -300,8 +302,8 @@ void i830DumpRegs (ScrnInfoPtr pScrn)
m2 = ((fp >> 0) & 0x3f);
m = 5 * (m1 + 2) + (m2 + 2);
dot = (ref * (5 * (m1 + 2) + (m2 + 2)) / (n + 2)) / (p1 * p2);
xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "pipe %s dot %d n %d m1 %d m2 %d p1 %d p2 %d\n",
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "pipe %s dot %d n %d m1 %d m2 %d p1 %d p2 %d\n",
pipe == 0 ? "A" : "B", dot, n, m1, m2, p1, p2);
}
xf86DrvMsg (pScrn->scrnIndex, X_WARNING, "DumpRegsEnd\n");
xf86DrvMsg (pScrn->scrnIndex, X_INFO, "DumpRegsEnd\n");
}

2
src/i830_randr.c
View File

@ -889,7 +889,7 @@ I830RandRCreateScreenResources12 (ScreenPtr pScreen)
mmWidth = mmWidth * width / pScreen->width;
if (height != pScreen->height)
mmHeight = mmHeight * height / pScreen->height;
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Setting screen physical size to %d x %d\n",
mmWidth, mmHeight);
I830RandRScreenSetSize (pScreen,

18
src/i830_sdvo.c
View File

@ -87,13 +87,22 @@ static Bool i830_sdvo_read_byte(I830OutputPtr output, int addr,
if (!xf86I2CReadByte(&dev_priv->d, addr, ch)) {
xf86DrvMsg(output->pI2CBus->scrnIndex, X_ERROR,
"Unable to read from %s slave %d.\n",
"Unable to read from %s slave 0x%02x.\n",
output->pI2CBus->BusName, dev_priv->d.SlaveAddr);
return FALSE;
}
return TRUE;
}
/** Read a single byte from the given address on the SDVO device. */
static Bool i830_sdvo_read_byte_quiet(I830OutputPtr output, int addr,
unsigned char *ch)
{
struct i830_sdvo_priv *dev_priv = output->dev_priv;
return xf86I2CReadByte(&dev_priv->d, addr, ch);
}
/** Write a single byte to the given address on the SDVO device. */
static Bool i830_sdvo_write_byte(I830OutputPtr output,
int addr, unsigned char ch)
@ -102,7 +111,7 @@ static Bool i830_sdvo_write_byte(I830OutputPtr output,
if (!xf86I2CWriteByte(&dev_priv->d, addr, ch)) {
xf86DrvMsg(output->pI2CBus->scrnIndex, X_ERROR,
"Unable to write to %s Slave %d.\n",
"Unable to write to %s Slave %02x.\n",
output->pI2CBus->BusName, dev_priv->d.SlaveAddr);
return FALSE;
}
@ -1053,7 +1062,10 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device)
/* Read the regs to test if we can talk to the device */
for (i = 0; i < 0x40; i++) {
if (!i830_sdvo_read_byte(output, i, &ch[i])) {
if (!i830_sdvo_read_byte_quiet(output, i, &ch[i])) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"No SDVO device found on SDVO%c\n",
output_device == SDVOB ? 'B' : 'C');
xf86DestroyI2CBusRec(output->pDDCBus, FALSE, FALSE);
xf86DestroyI2CDevRec(&dev_priv->d, FALSE);
xf86DestroyI2CBusRec(i2cbus, TRUE, TRUE);