diff -Nru xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/ChangeLog xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/ChangeLog
--- xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/ChangeLog	2010-06-09 19:50:01.000000000 +0100
+++ xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/ChangeLog	2010-07-06 01:45:01.000000000 +0100
@@ -1,3 +1,20 @@
+commit 21e643304a58fa368ffc3c0e80852173a4249a8d
+Author: Robert Hooker <sarvatt@ubuntu.com>
+Date:   Tue Jul 6 09:29:24 2010 +0845
+
+    Add debian tree from origin/debian-unstable
+
+commit 8087bc23a7662f1426a8bd6febf0d5d3844e6107
+Author: Francisco Jerez <currojerez@riseup.net>
+Date:   Wed Jun 16 14:59:37 2010 +0200
+
+    xv: Make sure we have a CRTC before setting up the overlay.
+    
+    Fixes a segfault when the destination area is off screen.
+    
+    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
+    Tested-by: Krzysztof Halasa <khc@pm.waw.pl>
+
 commit 2de1f7ae0b4441c1501568358acf2b870bb9dcc6
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Apr 27 15:11:35 2010 -0700
diff -Nru xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/debian/changelog xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/debian/changelog
--- xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/debian/changelog	2010-07-06 01:49:38.000000000 +0100
+++ xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/debian/changelog	2010-07-06 01:49:39.000000000 +0100
@@ -1,10 +1,10 @@
-xserver-xorg-video-siliconmotion (1:1.7.4+git20100609.2de1f7ae-0ubuntu0sarvatt) maverick; urgency=low
+xserver-xorg-video-siliconmotion (1:1.7.4+git20100706.8087bc23-0ubuntu0sarvatt) maverick; urgency=low
 
-  * Checkout from git 20100609 (master branch) up to commit
-    2de1f7ae0b4441c1501568358acf2b870bb9dcc6
+  * Checkout from git 20100706 (master branch) up to commit
+    8087bc23a7662f1426a8bd6febf0d5d3844e6107
   * Only added debian/ tree from origin/debian-unstable
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Wed, 09 Jun 2010 14:50:04 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com>  Tue, 06 Jul 2010 09:30:04 +0845
 
 xserver-xorg-video-siliconmotion (1:1.7.3-2) unstable; urgency=low
 
diff -Nru xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/.lastcommit xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/.lastcommit
--- xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/.lastcommit	2010-06-09 19:49:19.000000000 +0100
+++ xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/.lastcommit	2010-07-06 01:44:24.000000000 +0100
@@ -1 +1 @@
-commit 2de1f7ae0b4441c1501568358acf2b870bb9dcc6
+commit 8087bc23a7662f1426a8bd6febf0d5d3844e6107
diff -Nru xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/src/smi_video.c xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/src/smi_video.c
--- xserver-xorg-video-siliconmotion-1.7.4+git20100609.2de1f7ae/src/smi_video.c	2010-06-09 19:49:19.000000000 +0100
+++ xserver-xorg-video-siliconmotion-1.7.4+git20100706.8087bc23/src/smi_video.c	2010-07-06 01:44:24.000000000 +0100
@@ -1060,7 +1060,7 @@
     if(!xf86_crtc_clip_video_helper(pScrn, &crtc, crtcConf->crtc[0], &dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height))
 	LEAVE(Success);
 
-    if(pSmi->Dualhead && crtc == crtcConf->crtc[1])
+    if (crtc != crtcConf->crtc[0])
 	LEAVE(Success);
 
     /* Transform dstBox to the CRTC coordinates */
@@ -1521,6 +1521,9 @@
 					 width, height))
 	    LEAVE(Success);
 
+	if (!crtc)
+	    LEAVE(Success);
+
 	/* Transform dstBox to the CRTC coordinates */
 	dstBox.x1 -= crtc->x;
 	dstBox.y1 -= crtc->y;
@@ -2468,6 +2471,9 @@
 				    &x1, &x2, &y1, &y2, clipBoxes, surface->width, surface->height))
 	LEAVE(Success);
 
+    if (!crtc)
+	LEAVE(Success);
+
     /* Transform dstBox to the CRTC coordinates */
     dstBox.x1 -= crtc->x;
     dstBox.y1 -= crtc->y;