xserver: Branch 'master'

[Alex Deucher]

 hw/xfree86/modes/xf86Crtc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree e1860f241b7322c54c109cf5727df45b54b73916 (from 19d30c1c771c0f5c9dfc0f4cfb084dd2e528d992)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Sat Sep 22 17:54:51 2007 -0400

    Document xf86_crtc_clip_video_helper better.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index d375da8..064ff16 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2220,7 +2220,10 @@ xf86_covering_crtc(ScrnInfoPtr pScrn,
 
 /*
  * For overlay video, compute the relevant CRTC and
- * clip video to that
+ * clip video to that.
+ *
+ * returning FALSE means there was a memory failure of some kind,
+ * not that the video shouldn't be displayed
  */
 
 _X_EXPORT Bool