Attachment 58757 Details for Bug 43427 – Mark untiled BLT commands as fenced

[patch] Mark untiled BLT commands as fenced

0001-drm-i915-Mark-untiled-BLT-commands-as-fenced-on-gen2.patch (text/plain), 3.10 KB, created by Chris Wilson on 2012-03-20 07:55:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-03-20 07:55:04 UTC

Size: 3.10 KB

patch

obsolete

>From cc17e64393ce61d9a79745ac628b71eea5546157 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 20 Mar 2012 14:44:08 +0000
>Subject: [PATCH] drm/i915: Mark untiled BLT commands as fenced on gen2/3
>
>The BLT commands on gen2/3 utilize the fence registers and so we cannot
>modify any fences for the object whilst those commands are in flight.
>Currently we marked tiled commands as occupying a fence, but forgot to
>restrict the untiled commands from preventing a fence being assigned
>before they were completed.
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=43427
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_gem.c            |    7 -------
> drivers/gpu/drm/i915/i915_gem_execbuffer.c |   14 ++++++--------
> 2 files changed, 6 insertions(+), 15 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index d6700e1..2a7e72d 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1653,15 +1653,8 @@ i915_gem_object_move_to_active(struct drm_i915_gem_object *obj,
> 
> 	obj->last_rendering_seqno = seqno;
> 	if (obj->fenced_gpu_access) {
>-		struct drm_i915_fence_reg *reg;
>-
>-		BUG_ON(obj->fence_reg == I915_FENCE_REG_NONE);
>-
> 		obj->last_fenced_seqno = seqno;
> 		obj->last_fenced_ring = ring;
>-
>-		reg = &dev_priv->fence_regs[obj->fence_reg];
>-		list_move_tail(&reg->lru_list, &dev_priv->mm.fence_list);
> 	}
> }
> 
>diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>index 21fd5a4..da27db5 100644
>--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>@@ -173,9 +173,8 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
> 	 * write domain
> 	 */
> 	if (obj->base.write_domain &&
>-	    (((obj->base.write_domain != obj->base.pending_read_domains ||
>-	       obj->ring != ring)) ||
>-	     (obj->fenced_gpu_access && !obj->pending_fenced_gpu_access))) {
>+	    (obj->base.write_domain != obj->base.pending_read_domains ||
>+	     obj->ring != ring)) {
> 		flush_domains |= obj->base.write_domain;
> 		invalidate_domains |=
> 			obj->base.pending_read_domains & ~obj->base.write_domain;
>@@ -498,8 +497,8 @@ pin_and_fence_object(struct drm_i915_gem_object *obj,
> 				if (ret)
> 					goto err_unpin;
> 			}
>+			obj->pending_fenced_gpu_access = true;
> 		}
>-		obj->pending_fenced_gpu_access = need_fence;
> 	}
> 
> 	entry->offset = obj->gtt_offset;
>@@ -965,13 +964,12 @@ i915_gem_execbuffer_move_to_active(struct list_head *objects,
> 	struct drm_i915_gem_object *obj;
> 
> 	list_for_each_entry(obj, objects, exec_list) {
>-		  u32 old_read = obj->base.read_domains;
>-		  u32 old_write = obj->base.write_domain;
>-
>+		u32 old_read = obj->base.read_domains;
>+		u32 old_write = obj->base.write_domain;
> 
> 		obj->base.read_domains = obj->base.pending_read_domains;
> 		obj->base.write_domain = obj->base.pending_write_domain;
>-		obj->fenced_gpu_access = obj->pending_fenced_gpu_access;
>+		obj->fenced_gpu_access |= obj->pending_fenced_gpu_access;
> 
> 		i915_gem_object_move_to_active(obj, ring, seqno);
> 		if (obj->base.write_domain) {
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 43427: 54019 | 54020 | 54021 | 54023 | 54115 | 54116 | 54117 | 55910 | 56981 | 57123 | 57231 | 57409 | 57711 | 57827 | 58757 | 58782

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.