All drivers except savage emit the "Direct rendering disabled" message as an
informational message; savage makes it an error. Technically it's not an
error, since the server can continue, but it should probably be at least a
warning. This would make troubleshooting easier, because users know to look
for lines with a (WW) or (EE) on them.
Attached patch makes this message a warning across all drivers.
- ajax
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c,v
retrieving revision 1.3
diff -u -r1.3 atiscreen.c
--- xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c 12 Apr 2004 04:45:20 -0000 1.3
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c 20 Apr 2004 00:03:27 -0000
@@ -563,7 +563,7 @@
"Direct rendering enabled\n");
} else {
/* FIXME: Release unused offscreen mem here? */
- xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
"Direct rendering disabled\n");
}
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v
retrieving revision 1.37
diff -u -r1.37 r128_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 12 Mar 2004 21:22:52 -0000 1.37
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 20 Apr 2004 00:03:31 -0000
@@ -2466,7 +2466,7 @@
if (info->directRenderingEnabled) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
retrieving revision 1.86
diff -u -r1.86 radeon_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 29 Mar 2004 14:55:11 -0000 1.86
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 20 Apr 2004 00:03:37 -0000
@@ -4820,7 +4820,7 @@
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v
retrieving revision 1.47
diff -u -r1.47 i810_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 23 Oct 2003 02:23:30 -0000 1.47
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 20 Apr 2004 00:03:40 -0000
@@ -2187,7 +2187,7 @@
if (pI810->directRenderingEnabled) {
xf86DrvMsg(pScrn->scrnIndex, driFrom, "Direct rendering enabled\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, driFrom, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
pScreen->SaveScreen = I810SaveScreen;
Index: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v
retrieving revision 1.39
diff -u -r1.39 mga_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 23 Oct 2003 02:23:31 -0000 1.39
+++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 20 Apr 2004 00:03:43 -0000
@@ -3461,7 +3461,7 @@
if (pMga->directRenderingEnabled) {
xf86DrvMsg(pScrn->scrnIndex, driFrom, "Direct rendering enabled\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, driFrom, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
if (pMga->DualHeadEnabled && pMga->SecondCrtc == FALSE)
pMgaEnt->directRenderingEnabled = pMga->directRenderingEnabled;
Index: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v
retrieving revision 1.22
diff -u -r1.22 savage_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 26 Mar 2004 22:20:40 -0000 1.22
+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 20 Apr 2004 00:03:48 -0000
@@ -2715,7 +2715,7 @@
if (psav->directRenderingEnabled) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v
retrieving revision 1.13
diff -u -r1.13 sis_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c 30 Dec 2003 17:04:23 -0000 1.13
+++ xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c 20 Apr 2004 00:03:57 -0000
@@ -6520,7 +6520,7 @@
/* TODO */
/* SISSetLFBConfig(pSiS); */
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
#endif
Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
===================================================================
RCS file: /cvs/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c,v
retrieving revision 1.65
diff -u -r1.65 tdfx_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c 23 Oct 2003 02:23:31 -0000 1.65
+++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c 20 Apr 2004 00:04:00 -0000
@@ -2233,7 +2233,7 @@
if (pTDFX->directRenderingEnabled) {
xf86DrvMsg(pScrn->scrnIndex, driFrom, "Direct rendering enabled\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, driFrom, "Direct rendering disabled\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Direct rendering disabled\n");
}
#endif
