Attachment 81971 Details for Bug 45092 – Hack to prevent movement of swizzled pages

[patch] Hack to prevent movement of swizzled pages

0001-drm-i915-Hack-to-prevent-page-movement-of-unknown-sw.patch (text/plain), 3.30 KB, created by Chris Wilson on 2013-07-03 17:54:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-07-03 17:54:27 UTC

Size: 3.30 KB

patch

obsolete

>From 0677a2993f6fe46168c81a46f7c4160e60620e2c Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 3 Jul 2013 17:59:59 +0100
>Subject: [PATCH] drm/i915: Hack to prevent page movement of unknown swizzled
> pages
>
>---
> drivers/gpu/drm/i915/i915_drv.h        |  1 +
> drivers/gpu/drm/i915/i915_gem.c        | 14 ++++++++++++++
> drivers/gpu/drm/i915/i915_gem_tiling.c | 16 ++++++++++++++++
> 3 files changed, 31 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 90e2351..7f52e17 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -579,6 +579,7 @@ enum intel_sbi_destination {
> #define QUIRK_PIPEA_FORCE (1<<0)
> #define QUIRK_LVDS_SSC_DISABLE (1<<1)
> #define QUIRK_INVERT_BRIGHTNESS (1<<2)
>+#define QUIRK_PIN_SWIZZLED_PAGES (1<<3)
> 
> struct intel_fbdev;
> struct intel_fbc_work;
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 7f3447c..8e32f16 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1828,6 +1828,10 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
> 	if (i915_gem_object_needs_bit17_swizzle(obj))
> 		i915_gem_object_do_bit_17_swizzle(obj);
> 
>+	if (obj->tiling_mode != I915_TILING_NONE &&
>+	    dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES)
>+		i915_gem_object_pin_pages(obj);
>+
> 	return 0;
> 
> err_pages:
>@@ -3825,6 +3829,7 @@ int
> i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
> 		       struct drm_file *file_priv)
> {
>+	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct drm_i915_gem_madvise *args = data;
> 	struct drm_i915_gem_object *obj;
> 	int ret;
>@@ -3852,6 +3857,15 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
> 		goto out;
> 	}
> 
>+	if (obj->pages &&
>+	    obj->tiling_mode != I915_TILING_NONE &&
>+	    dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES) {
>+		if (obj->madv == I915_MADV_WILLNEED)
>+			i915_gem_object_unpin_pages(obj);
>+		if (args->madv == I915_MADV_WILLNEED)
>+			i915_gem_object_pin_pages(obj);
>+	}
>+
> 	if (obj->madv != __I915_MADV_PURGED)
> 		obj->madv = args->madv;
> 
>diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
>index 537545b..1ab0d38 100644
>--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
>+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
>@@ -165,6 +165,13 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
> 				  "Disabling tiling.\n");
> 			swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;
> 			swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;
>+		} else {
>+			if (swizzle_x != I915_BIT_6_SWIZZLE_NONE &&
>+			    I915_READ16(C0DRB3 + 0x1000) !=
>+			    I915_READ16(C1DRB3 + 0x1000)) {
>+				DRM_INFO("Interleaved with L-shape memory\n");
>+				dev_priv->quirks |= QUIRK_PIN_SWIZZLED_PAGES;
>+			}
> 		}
> 	} else {
> 		/* The 965, G33, and newer, have a very flexible memory
>@@ -374,6 +381,15 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
> 		}
> 
> 		if (ret == 0) {
>+			if (obj->pages &&
>+			    obj->madv == I915_MADV_WILLNEED &&
>+			    dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES) {
>+				if (args->tiling_mode == I915_TILING_NONE)
>+					i915_gem_object_unpin_pages(obj);
>+				if (obj->tiling_mode == I915_TILING_NONE)
>+					i915_gem_object_pin_pages(obj);
>+			}
>+
> 			obj->fence_dirty =
> 				obj->fenced_gpu_access ||
> 				obj->fence_reg != I915_FENCE_REG_NONE;
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 45092: 55974 | 55975 | 55976 | 55977 | 56003 | 56044 | 56154 | 81971 | 111328

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.