Attachment 75871 Details for Bug 61628 – xf86-video-intel-2.21.3-revert-dc643ef753bcfb69685f1eb10828d0c8f830c30e.patch

[patch] xf86-video-intel-2.21.3-revert-dc643ef753bcfb69685f1eb10828d0c8f830c30e.patch

revert-dc643ef753bcfb69685f1eb10828d0c8f830c30e.patch (text/plain), 1.45 KB, created by Coacher on 2013-03-03 22:59:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Coacher

Created: 2013-03-03 22:59:40 UTC

Size: 1.45 KB

patch

obsolete

>--- src/sna/sna_accel.c.orig	2013-02-19 13:49:42.000000000 +0400
>+++ src/sna/sna_accel.c	2013-03-04 02:07:57.771626602 +0400
>@@ -1614,8 +1614,7 @@
> 
> 	if (priv->mapped) {
> 		assert(!priv->shm && priv->stride);
>-		pixmap->devPrivate.ptr = PTR(priv->ptr);
>-		pixmap->devKind = priv->stride;
>+		pixmap->devPrivate.ptr = NULL;
> 		priv->mapped = false;
> 	}
> 
>@@ -1743,11 +1742,11 @@
> 
> done:
> 	if (flags & MOVE_WRITE) {
>-		assert(DAMAGE_IS_ALL(priv->cpu_damage));
> 		priv->source_count = SOURCE_BIAS;
> 		assert(priv->gpu_bo == NULL || priv->gpu_bo->proxy == NULL);
> 		if (priv->gpu_bo && priv->gpu_bo->domain != DOMAIN_GPU) {
> 			DBG(("%s: discarding inactive GPU bo\n", __FUNCTION__));
>+			assert(DAMAGE_IS_ALL(priv->cpu_damage));
> 			sna_pixmap_free_gpu(sna, priv);
> 		}
> 	}
>@@ -1755,8 +1754,7 @@
> 	if (priv->cpu_bo) {
> 		if ((flags & MOVE_ASYNC_HINT) == 0) {
> 			DBG(("%s: syncing CPU bo\n", __FUNCTION__));
>-			kgem_bo_sync__cpu_full(&sna->kgem,
>-					       priv->cpu_bo, flags & MOVE_WRITE);
>+			kgem_bo_sync__cpu(&sna->kgem, priv->cpu_bo);
> 			assert(!priv->shm || !kgem_bo_is_busy(priv->cpu_bo));
> 		}
> 		if (flags & MOVE_WRITE) {
>@@ -2284,8 +2282,7 @@
> 	}
> 	if ((flags & MOVE_ASYNC_HINT) == 0 && priv->cpu_bo) {
> 		DBG(("%s: syncing cpu bo\n", __FUNCTION__));
>-		kgem_bo_sync__cpu_full(&sna->kgem,
>-				       priv->cpu_bo, flags & MOVE_WRITE);
>+		kgem_bo_sync__cpu(&sna->kgem, priv->cpu_bo);
> 	}
> 	priv->cpu = (flags & MOVE_ASYNC_HINT) == 0;
> 	assert(pixmap->devPrivate.ptr);

Actions: View | Splinter Review

Attachments on bug 61628: 75706 | 75707 | 75708 | 75871 | 75892 | 75920 | 75921 | 76040

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.