1 files changed, 0 insertions, 74 deletions
diff --git a/x11-drivers/xf86-video-i810/files/2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch b/x11-drivers/xf86-video-i810/files/2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch
deleted file mode 100644
index a3f39f1f52ce..000000000000
--- a/x11-drivers/xf86-video-i810/files/2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 2aada39e1a2517c07c9ae87722341b6150f75b7d Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Sat, 12 Apr 2008 16:39:00 -0700
-Subject: [PATCH] Skip copying on FOURCC_XVMC surfaces
- (cherry picked from commit 6366e4de540c4713cbc8402c89516464bbdc35b9)
-
-
-diff --git a/src/i830_video.c b/src/i830_video.c
-index 67fe291..5d6c209 100644
---- a/src/i830_video.c
-+++ b/src/i830_video.c
-@@ -2119,6 +2119,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
-     switch (id) {
-     case FOURCC_YV12:
-     case FOURCC_I420:
-+    case FOURCC_XVMC:
- 	OVERLAY_DEBUG("YUV420\n");
- #if 0
- 	/* set UV vertical phase to -0.25 */
-@@ -2133,7 +2134,6 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
- 	break;
-     case FOURCC_UYVY:
-     case FOURCC_YUY2:
--    default:
- 	OVERLAY_DEBUG("YUV422\n");
- 	overlay->OSTRIDE = dstPitch;
- 	OCMD &= ~SOURCE_FORMAT;
-@@ -2376,6 +2376,7 @@ I830PutImage(ScrnInfoPtr pScrn,
-     switch (destId) {
-     case FOURCC_YV12:
-     case FOURCC_I420:
-+    case FOURCC_XVMC:
- 	if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
- 	    dstPitch = ((height / 2) + pitchAlignMask) & ~pitchAlignMask;
- 	    size = dstPitch * width * 3;
-@@ -2386,7 +2387,7 @@ I830PutImage(ScrnInfoPtr pScrn,
- 	break;
-     case FOURCC_UYVY:
-     case FOURCC_YUY2:
--    default:
-+
- 	if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
- 	    dstPitch = ((height << 1) + pitchAlignMask) & ~pitchAlignMask;
- 	    size = dstPitch * width;
-@@ -2395,6 +2396,10 @@ I830PutImage(ScrnInfoPtr pScrn,
- 	    size = dstPitch * height;
- 	}
- 	break;
-+    default:  
-+	dstPitch = 0;
-+	size = 0;
-+	break;
-     }
- #if 0
-     ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, dstPitch, size);
-@@ -2480,11 +2485,14 @@ I830PutImage(ScrnInfoPtr pScrn,
- 	break;
-     case FOURCC_UYVY:
-     case FOURCC_YUY2:
--    default:
- 	nlines = ((y2 + 0xffff) >> 16) - top;
- 	I830CopyPackedData(pScrn, pPriv, buf, srcPitch, dstPitch, top, left,
- 			   nlines, npixels);
- 	break;
-+    case FOURCC_XVMC:
-+	break;
-+    default:
-+	break;
-     }
- 
-     if (pDraw->type == DRAWABLE_WINDOW) {
--- 
-1.5.5.3
-