Attachment 71924 Details for Bug 28813 – Hack to keep tiled pages pinned

[patch] Hack to keep tiled pages pinned

0001-drm-i915-Hack-to-prevent-page-movement-of-unknown-sw.patch (text/plain), 1.86 KB, created by Chris Wilson on 2012-12-21 12:38:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-12-21 12:38:17 UTC

Size: 1.86 KB

patch

obsolete

>From 31f8239a6b4b356eb0d9bbd6704460e36c14dc35 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 21 Dec 2012 09:25:45 +0000
>Subject: [PATCH] drm/i915: Hack to prevent page movement of unknown swizzled
> pages
>
>---
> drivers/gpu/drm/i915/i915_gem.c        |   10 ++++++++++
> drivers/gpu/drm/i915/i915_gem_tiling.c |    7 +++++++
> 2 files changed, 17 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index a3e0d0d..d97b1bd 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1974,6 +1974,9 @@ 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)
>+		i915_gem_object_pin_pages(obj);
>+
> 	return 0;
> 
> err_pages:
>@@ -3805,6 +3808,13 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
> 		goto out;
> 	}
> 
>+	if (obj->pages && obj->tiling_mode != I915_TILING_NONE) {
>+		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 65f1d4f..4b59199 100644
>--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
>+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
>@@ -382,6 +382,13 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
> 		}
> 
> 		if (ret == 0) {
>+			if (obj->madv == I915_MADV_WILLNEED) {
>+				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.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 28813: 36603 | 36604 | 36605 | 55310 | 55311 | 55312 | 55313 | 55678 | 71911 | 71924 | 71948 | 72183 | 81967 | 81968 | 81969 | 81970 | 113489 | 113490

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.