[PATCH] More explicit error message when the kernel module has been configured 'noaccel' but the xorg configuration doesn't disable accelleration

[PATCH] More explicit error message when the kernel module has been configured 'noaccel' but the xorg configuration doesn't disable accelleration

[Arnout Engelen]

I ran into this the other day - this more explicit error message might save someone some
head-scratching ;).
---
 src/nv_dma.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/nv_dma.c b/src/nv_dma.c
index d2a6d00..339b4fe 100644
--- a/src/nv_dma.c
+++ b/src/nv_dma.c
@@ -53,8 +53,13 @@ NVInitDma(ScrnInfoPtr pScrn)
 	ret = nouveau_object_new(device, 0, NOUVEAU_FIFO_CHANNEL_CLASS,
 				 data, size, &pNv->channel);
 	if (ret) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-			   "Error creating GPU channel: %d\n", ret);
+		if (ret == -ENODEV)
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "'No such device' while creating GPU channel: perhaps you disabled "
+			           "accelleration in your module config but not in your X.Org config\n");
+		else
+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+				   "Error creating GPU channel: %d, %s\n", ret, strerror(-ret));
 		return FALSE;
 	}
 
-- 
1.7.10