Attachment 108934 Details for Bug 85896 – Fix obj->map_and_fenceable across tiling changes

[patch] Fix obj->map_and_fenceable across tiling changes

0001-drm-i915-Fix-obj-map_and_fenceable-across-tiling-cha.patch (text/plain), 1.53 KB, created by Chris Wilson on 2014-11-05 08:10:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-11-05 08:10:35 UTC

Size: 1.53 KB

patch

obsolete

>From 72ee1e42913cfdacf934158bfb4b0aa51823ca16 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 5 Nov 2014 08:09:12 +0000
>Subject: [PATCH] drm/i915: Fix obj->map_and_fenceable across tiling changes
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_gem_tiling.c | 19 +++----------------
> 1 file changed, 3 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
>index 749ab485569e..cd7f4734c9f8 100644
>--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
>+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
>@@ -375,22 +375,9 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
> 		 * has to also include the unfenced register the GPU uses
> 		 * whilst executing a fenced command for an untiled object.
> 		 */
>-
>-		obj->map_and_fenceable =
>-			!i915_gem_obj_ggtt_bound(obj) ||
>-			(i915_gem_obj_ggtt_offset(obj) +
>-			 obj->base.size <= dev_priv->gtt.mappable_end &&
>-			 i915_gem_object_fence_ok(obj, args->tiling_mode));
>-
>-		/* Rebind if we need a change of alignment */
>-		if (!obj->map_and_fenceable) {
>-			u32 unfenced_align =
>-				i915_gem_get_gtt_alignment(dev, obj->base.size,
>-							    args->tiling_mode,
>-							    false);
>-			if (i915_gem_obj_ggtt_offset(obj) & (unfenced_align - 1))
>-				ret = i915_gem_object_ggtt_unbind(obj);
>-		}
>+		if (obj->map_and_fenceable &&
>+		    !i915_gem_object_fence_ok(obj, args->tiling_mode))
>+			ret = i915_gem_object_ggtt_unbind(obj);
> 
> 		if (ret == 0) {
> 			obj->fence_dirty =
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 85896: 108929 | 108934

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.