Module Name:    src
Committed By:   riastradh
Date:           Tue Mar  3 13:57:20 UTC 2015

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
radeon_fence_wait returns 0, not positive, on success.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.7 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.7	Mon Mar  2 23:29:56 2015
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c	Tue Mar  3 13:57:20 2015
@@ -425,7 +425,12 @@ static int radeon_fence_wait_seq(struct 
 		}
 	}
 	spin_unlock(&rdev->fence_lock);
-	return r;
+	/*
+	 * The timed wait returns 0 on timeout or the positive number
+	 * of ticks left (minimum 1) if the condition passed.  We
+	 * return zero on success.
+	 */
+	return (r < 0? r : 0);
 }
 
 /**

Reply via email to