Attachment 863625 Details for Bug 987519 – Patch which solves the problem

[patch] Patch which solves the problem

01exa.patch (text/plain), 1.63 KB, created by Julius Schwartzenberg on 2014-02-15 22:07:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julius Schwartzenberg

Created: 2014-02-15 22:07:32 UTC

Size: 1.63 KB

patch

obsolete

>Index: xserver-xorg-video-sis-0.10.7/src/sis310_accel.c
>===================================================================
>--- xserver-xorg-video-sis-0.10.7.orig/src/sis310_accel.c	2012-06-06 04:47:03.000000000 -0400
>+++ xserver-xorg-video-sis-0.10.7/src/sis310_accel.c	2013-09-07 16:01:41.429227632 -0400
>@@ -1874,7 +1874,7 @@
> {
> 	ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen);
> 	SISPtr pSiS = SISPTR(pScrn);
>-	unsigned char *dst = pDst->devPrivate.ptr;
>+	unsigned char *dst = ((unsigned char *) pSiS->FbBase) + exaGetPixmapOffset(pDst);
> 	int dst_pitch = exaGetPixmapPitch(pDst);
> 
> 	(pSiS->SyncAccel)(pScrn);
>@@ -1882,7 +1882,7 @@
> 	if(pDst->drawable.bitsPerPixel < 8)
> 	   return FALSE;
> 
>-	dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * src_pitch);
>+	dst += (x * pDst->drawable.bitsPerPixel / 8) + (y * dst_pitch);
> 	while(h--) {
> 	   SiSMemCopyToVideoRam(pSiS, dst, (unsigned char *)src,
> 				(w * pDst->drawable.bitsPerPixel / 8));
>@@ -1953,9 +1953,8 @@
> {
> 	ScrnInfoPtr pScrn = xf86ScreenToScrn(pSrc->drawable.pScreen);
> 	SISPtr pSiS = SISPTR(pScrn);
>-	unsigned char *src = pSrc->devPrivate.ptr;
>+	unsigned char *src = ((unsigned char *) pSiS->FbBase) + exaGetPixmapOffset(pSrc);
> 	int src_pitch = exaGetPixmapPitch(pSrc);
>-	int size = src_pitch < dst_pitch ? src_pitch : dst_pitch;
> 
> 	(pSiS->SyncAccel)(pScrn);
> 
>@@ -1964,7 +1963,7 @@
> 
> 	src += (x * pSrc->drawable.bitsPerPixel / 8) + (y * src_pitch);
> 	while(h--) {
>-	   SiSMemCopyFromVideoRam(pSiS, (unsigned char *)dst, src, size);
>+	   SiSMemCopyFromVideoRam(pSiS, (unsigned char *)dst, src, (w * pSrc->drawable.bitsPerPixel / 8));
> 	   src += src_pitch;
> 	   dst += dst_pitch;
> 	}

Actions: View | Diff

Attachments on bug 987519: 777355 | 863625