xf86-video-intel: src/intel_dri.c

[Chris Wilson]

 src/intel_dri.c |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 7667ad8432c032aec3a2aa004fc4dfc1877971b3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 24 09:42:29 2010 +0000

    dri: Differentiate identical "get vblank failed" messages with line no
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index a41555c..b7afffd 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -1038,7 +1038,9 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
 	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
 	if (ret) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-			   "get vblank counter failed: %s\n", strerror(errno));
+			   "%s:%d get vblank counter failed: %s\n",
+			   __FUNCTION__, __LINE__,
+			   strerror(errno));
 		return FALSE;
 	}
 
@@ -1092,7 +1094,9 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
 	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
 	if (ret) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-			   "get vblank counter failed: %s\n", strerror(errno));
+			   "%s:%d get vblank counter failed: %s\n",
+			   __FUNCTION__, __LINE__,
+			   strerror(errno));
 		goto out_complete;
 	}
 
@@ -1120,7 +1124,9 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
 		ret = drmWaitVBlank(intel->drmSubFD, &vbl);
 		if (ret) {
 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-				   "get vblank counter failed: %s\n", strerror(errno));
+				   "%s:%d get vblank counter failed: %s\n",
+				   __FUNCTION__, __LINE__,
+				   strerror(errno));
 			goto out_complete;
 		}
 
@@ -1153,7 +1159,9 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
 	ret = drmWaitVBlank(intel->drmSubFD, &vbl);
 	if (ret) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-			   "get vblank counter failed: %s\n", strerror(errno));
+			   "%s:%d get vblank counter failed: %s\n",
+			   __FUNCTION__, __LINE__,
+			   strerror(errno));
 		goto out_complete;
 	}