[PATCH 22/27] gpu trash

Matthew Auld matthew.auld at intel.com
Tue Oct 1 15:19:12 UTC 2019


Signed-off-by: Matthew Auld <matthew.auld at intel.com>
---
 drivers/gpu/drm/i915/selftests/i915_gem.c | 97 +++++++++++++++++------
 1 file changed, 71 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index 4951957a4d8d..6061c821047d 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -6,6 +6,8 @@
 
 #include <linux/random.h>
 
+#include "gem/i915_gem_region.h"
+#include "gem/i915_gem_object_blt.h"
 #include "gem/selftests/igt_gem_utils.h"
 #include "gem/selftests/mock_context.h"
 #include "gt/intel_gt.h"
@@ -34,36 +36,81 @@ static int switch_to_context(struct drm_i915_private *i915,
 	return 0;
 }
 
-static void trash_stolen(struct drm_i915_private *i915)
+static void trash_stolen(struct drm_i915_private *i915,
+			 struct i915_gem_context *ctx)
 {
-	struct i915_ggtt *ggtt = &i915->ggtt;
-	const u64 slot = ggtt->error_capture.start;
 	const resource_size_t size = resource_size(&i915->dsm);
-	unsigned long page;
 	u32 prng = 0x12345678;
 
-	if (!HAS_MAPPABLE_APERTURE(i915))
-		return;
+	if (HAS_MAPPABLE_APERTURE(i915)) {
+		struct i915_ggtt *ggtt = &i915->ggtt;
+		const u64 slot = ggtt->error_capture.start;
+		unsigned long page;
+
+		for (page = 0; page < size; page += PAGE_SIZE) {
+			const dma_addr_t dma = i915->dsm.start + page;
+			u32 __iomem *s;
+			int x;
+
+			ggtt->vm.insert_page(&ggtt->vm, dma, slot,
+					     I915_CACHE_NONE, 0);
+
+			s = io_mapping_map_atomic_wc(&ggtt->iomap, slot);
+			for (x = 0; x < PAGE_SIZE / sizeof(u32); x++) {
+				prng = next_pseudo_random32(prng);
+				iowrite32(prng, &s[x]);
+			}
+			io_mapping_unmap_atomic(s);
+		}
+
+		ggtt->vm.clear_range(&ggtt->vm, slot, PAGE_SIZE);
+	} else {
+		struct intel_memory_region *clone;
+		struct drm_i915_gem_object *obj;
+		struct intel_context *ce;
+		int err;
 
-	for (page = 0; page < size; page += PAGE_SIZE) {
-		const dma_addr_t dma = i915->dsm.start + page;
-		u32 __iomem *s;
-		int x;
+		if (!HAS_ENGINE(i915, BCS0))
+			return;
 
-		ggtt->vm.insert_page(&ggtt->vm, dma, slot, I915_CACHE_NONE, 0);
+		if (!size)
+			return;
 
-		s = io_mapping_map_atomic_wc(&ggtt->iomap, slot);
-		for (x = 0; x < PAGE_SIZE / sizeof(u32); x++) {
-			prng = next_pseudo_random32(prng);
-			iowrite32(prng, &s[x]);
+		clone = mock_region_create(i915, i915->dsm.start, size,
+					   PAGE_SIZE, 0);
+		if (IS_ERR(clone)) {
+			WARN_ON(1);
+			return;
 		}
-		io_mapping_unmap_atomic(s);
-	}
 
-	ggtt->vm.clear_range(&ggtt->vm, slot, PAGE_SIZE);
+		obj = i915_gem_object_create_region(clone, size, 0);
+		if (IS_ERR(obj)) {
+			WARN_ON(1);
+			return;
+		}
+
+		ce = i915_gem_context_get_engine(ctx, BCS0);
+		if (IS_ERR(ce)) {
+			WARN_ON(1);
+			return;
+		}
+
+		mutex_lock(&i915->drm.struct_mutex);
+		err = i915_gem_object_fill_blt(obj, ce, prng);
+		mutex_unlock(&i915->drm.struct_mutex);
+
+		intel_context_put(ce);
+		i915_gem_object_put(obj);
+		intel_memory_region_put(clone);
+		if (err) {
+			WARN_ON(1);
+			return;
+		}
+	}
 }
 
-static void simulate_hibernate(struct drm_i915_private *i915)
+static void simulate_hibernate(struct drm_i915_private *i915,
+			       struct i915_gem_context *ctx)
 {
 	intel_wakeref_t wakeref;
 
@@ -76,7 +123,7 @@ static void simulate_hibernate(struct drm_i915_private *i915)
 	 * for automated testing across a cluster), so to simulate the effect
 	 * of stolen being trashed across S4, we trash it ourselves.
 	 */
-	trash_stolen(i915);
+	trash_stolen(i915, ctx);
 
 	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
 }
@@ -151,15 +198,14 @@ static int igt_gem_suspend(void *arg)
 	if (err)
 		goto out;
 
+	simulate_hibernate(i915, ctx);
+
 	err = pm_prepare(i915);
 	if (err)
 		goto out;
 
 	pm_suspend(i915);
 
-	/* Here be dragons! Note that with S3RST any S3 may become S4! */
-	simulate_hibernate(i915);
-
 	pm_resume(i915);
 
 	mutex_lock(&i915->drm.struct_mutex);
@@ -190,15 +236,14 @@ static int igt_gem_hibernate(void *arg)
 	if (err)
 		goto out;
 
+	simulate_hibernate(i915, ctx);
+
 	err = pm_prepare(i915);
 	if (err)
 		goto out;
 
 	pm_hibernate(i915);
 
-	/* Here be dragons! */
-	simulate_hibernate(i915);
-
 	pm_resume(i915);
 
 	mutex_lock(&i915->drm.struct_mutex);
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list