Attachment 76040 Details for Bug 61628 – Disable read-read optimisations

[patch] Disable read-read optimisations

0001-sna-Disable-read-read-optimisations.patch (text/plain), 2.03 KB, created by Chris Wilson on 2013-03-06 19:04:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-03-06 19:04:08 UTC

Size: 2.03 KB

patch

obsolete

>From c6a59bee3bf5f42147f75a714f2b9aa26590329e Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 6 Mar 2013 19:01:50 +0000
>Subject: [PATCH] sna: Disable read-read optimisations
>
>There is still a lurking issue, so punt on the optimisation for now.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61628
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> src/sna/sna_accel.c |   14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
>index 750914d..ae6d3c1 100644
>--- a/src/sna/sna_accel.c
>+++ b/src/sna/sna_accel.c
>@@ -57,6 +57,7 @@
> #define FORCE_INPLACE 0
> #define FORCE_FALLBACK 0
> #define FORCE_FLUSH 0
>+#define FORCE_FULL_SYNC 1 /* https://bugs.freedesktop.org/show_bug.cgi?id=61628 */
> 
> #define DEFAULT_TILING I915_TILING_X
> 
>@@ -1671,9 +1672,8 @@ skip_inplace_map:
> 				priv->clear = false;
> 			}
> 
>-			kgem_bo_sync__cpu_full(&sna->kgem,
>-					       priv->gpu_bo,
>-					       flags & MOVE_WRITE);
>+			kgem_bo_sync__cpu_full(&sna->kgem, priv->gpu_bo,
>+					       FORCE_FULL_SYNC || flags & MOVE_WRITE);
> 			assert_pixmap_damage(pixmap);
> 			DBG(("%s: operate inplace (CPU)\n", __FUNCTION__));
> 			return true;
>@@ -1781,8 +1781,8 @@ done:
> 	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_full(&sna->kgem, priv->cpu_bo,
>+					       FORCE_FULL_SYNC || flags & MOVE_WRITE);
> 			assert(!priv->shm || !kgem_bo_is_busy(priv->cpu_bo));
> 		}
> 		if (flags & MOVE_WRITE) {
>@@ -2312,8 +2312,8 @@ out:
> 	}
> 	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_full(&sna->kgem, priv->cpu_bo,
>+				       FORCE_FULL_SYNC || flags & MOVE_WRITE);
> 	}
> 	priv->cpu = (flags & MOVE_ASYNC_HINT) == 0;
> 	assert(pixmap->devPrivate.ptr);
>-- 
>1.7.10.4
>

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.