Skip to contentSkip to conversation

Prereqs for TTM accelerated migration

PATCH Superseded Thomas Hellström 4 participants 27 messages Jun 9, 2021

Subsystems (2)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover Prereqs for TTM accelerated migration

A couple of patches from Chris which implement pipelined migration and clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas, as well as modified the above patches for ww locking- and lmem support.

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early review opportunity.

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a CI warning / failure.

Chris Wilson (6):
drm/i915/gt: Add an insert_entry for gen8_ppgtt drm/i915/gt: Add a routine to iterate over the pagetables of a GTT drm/i915/gt: Export the pinned context constructor and destructor drm/i915/gt: Pipelined page migration
drm/i915/gt: Pipelined clear
drm/i915/gt: Setup a default migration context on the GT

Thomas Hellström (3):
drm/i915: Reference objects on the ww object list drm/i915: Break out dma_resv ww locking utilities to separate files drm/i915: Introduce a ww transaction helper

 drivers/gpu/drm/i915/Makefile                 |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_object.h    |   9 +-
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c          |  68 ++
 drivers/gpu/drm/i915/gt/intel_engine.h        |  12 +
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  27 +-
 drivers/gpu/drm/i915/gt/intel_gpu_commands.h  |   2 +
 drivers/gpu/drm/i915/gt/intel_gt.c            |   4 +
 drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
 drivers/gpu/drm/i915/gt/intel_gtt.h           |   7 +
 drivers/gpu/drm/i915/gt/intel_migrate.c       | 685 ++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_migrate.h       |  65 ++
 drivers/gpu/drm/i915/gt/intel_migrate_types.h |  15 +
 drivers/gpu/drm/i915/gt/intel_renderstate.h   |   1 +
 drivers/gpu/drm/i915/gt/intel_ring.h          |   1 +
 drivers/gpu/drm/i915/gt/selftest_migrate.c    | 671 +++++++++++++++++
 drivers/gpu/drm/i915/i915_gem.c               |  52 --
 drivers/gpu/drm/i915/i915_gem.h               |  12 -
 drivers/gpu/drm/i915/i915_gem_ww.c            |  63 ++
 drivers/gpu/drm/i915/i915_gem_ww.h            |  50 ++
 .../drm/i915/selftests/i915_live_selftests.h  |   1 +
 .../drm/i915/selftests/i915_perf_selftests.h  |   1 +
 21 files changed, 1675 insertions(+), 76 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c
 create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c
 create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h
Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v2 1/9 drm/i915: Reference objects on the ww object list

Since the ww transaction endpoint easily end up far out-of-scope of the objects on the ww object list, particularly for contending lock objects, make sure we reference objects on the list so they don't disappear under us.

This comes with a performance penalty so it's been debated whether this is really needed. But I think this is motivated by the fact that locking is typically difficult to get right, and whatever we can do to make it simpler for developers moving forward should be done, unless the performance impact is far too high.

---
 drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 ++++++--
 drivers/gpu/drm/i915/i915_gem.c            | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.h +6 -2
index 7c0eb425cb3b..1fafcc89ecee 100644
@@ -169,13 +169,17 @@ static inline int __i915_gem_object_lock(struct drm_i915_gem_object *obj,
 	else
 		ret = dma_resv_lock(obj->base.resv, ww ? &ww->ctx : NULL);
 
-	if (!ret && ww)
+	if (!ret && ww) {
+		i915_gem_object_get(obj);
 		list_add_tail(&obj->obj_link, &ww->obj_list);
+	}
 	if (ret == -EALREADY)
 		ret = 0;
 
-	if (ret == -EDEADLK)
+	if (ret == -EDEADLK) {
+		i915_gem_object_get(obj);
 		ww->contended = obj;
+	}
 
 	return ret;
 }
drivers/gpu/drm/i915/i915_gem.c +4 -0
index 589388dec48a..3f060ab58c5d 100644
@@ -1219,6 +1219,7 @@ static void i915_gem_ww_ctx_unlock_all(struct i915_gem_ww_ctx *ww)
 	while ((obj = list_first_entry_or_null(&ww->obj_list, struct drm_i915_gem_object, obj_link))) {
 		list_del(&obj->obj_link);
 		i915_gem_object_unlock(obj);
+		i915_gem_object_put(obj);
 	}
 }
 
@@ -1226,6 +1227,7 @@ void i915_gem_ww_unlock_single(struct drm_i915_gem_object *obj)
 {
 	list_del(&obj->obj_link);
 	i915_gem_object_unlock(obj);
+	i915_gem_object_put(obj);
 }
 
 void i915_gem_ww_ctx_fini(struct i915_gem_ww_ctx *ww)
@@ -1250,6 +1252,8 @@ int __must_check i915_gem_ww_ctx_backoff(struct i915_gem_ww_ctx *ww)
 
 	if (!ret)
 		list_add_tail(&ww->contended->obj_link, &ww->obj_list);
+	else
+		i915_gem_object_put(ww->contended);
 
 	ww->contended = NULL;
 
Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 2/9 drm/i915: Break out dma_resv ww locking utilities to separate files

In reply to Thomas Hellström

As we're about to add more ww-related functionality, break out the dma_resv ww locking utilities to their own files

---
v2:
- Make sure filenames are sorted in include file lists and Makefile (Reported by Matthew Auld)

---
 drivers/gpu/drm/i915/Makefile               |  1 +
 drivers/gpu/drm/i915/gem/i915_gem_object.h  |  1 +
 drivers/gpu/drm/i915/gt/intel_renderstate.h |  1 +
 drivers/gpu/drm/i915/i915_gem.c             | 56 ------------------
 drivers/gpu/drm/i915/i915_gem.h             | 12 ----
 drivers/gpu/drm/i915/i915_gem_ww.c          | 63 +++++++++++++++++++++
 drivers/gpu/drm/i915/i915_gem_ww.h          | 21 +++++++
 7 files changed, 87 insertions(+), 68 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c
 create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h
drivers/gpu/drm/i915/Makefile +1 -0
index 4f22cac1c49b..16a5a006cf7c 100644
@@ -164,6 +164,7 @@ i915-y += \
 	  i915_cmd_parser.o \
 	  i915_gem_evict.o \
 	  i915_gem_gtt.o \
+	  i915_gem_ww.o \
 	  i915_gem.o \
 	  i915_globals.o \
 	  i915_query.o \
drivers/gpu/drm/i915/gem/i915_gem_object.h +1 -0
index 1fafcc89ecee..bdab929e448b 100644
@@ -14,6 +14,7 @@
 #include "display/intel_frontbuffer.h"
 #include "i915_gem_object_types.h"
 #include "i915_gem_gtt.h"
+#include "i915_gem_ww.h"
 #include "i915_vma_types.h"
 
 /*
drivers/gpu/drm/i915/gt/intel_renderstate.h +1 -0
index 48f009203917..4da4c5234ef0 100644
@@ -8,6 +8,7 @@
 
 #include <linux/types.h>
 #include "i915_gem.h"
+#include "i915_gem_ww.h"
 
 struct i915_request;
 struct intel_context;
drivers/gpu/drm/i915/i915_gem.c +0 -56

62 lines not on this page · raw message

drivers/gpu/drm/i915/i915_gem.h +0 -12
index 440c35f1abc9..d0752e5553db 100644
@@ -123,16 +123,4 @@ static inline bool __tasklet_is_scheduled(struct tasklet_struct *t)
 	return test_bit(TASKLET_STATE_SCHED, &t->state);
 }
 
-struct i915_gem_ww_ctx {
-	struct ww_acquire_ctx ctx;
-	struct list_head obj_list;
-	bool intr;
-	struct drm_i915_gem_object *contended;
-};
-
-void i915_gem_ww_ctx_init(struct i915_gem_ww_ctx *ctx, bool intr);
-void i915_gem_ww_ctx_fini(struct i915_gem_ww_ctx *ctx);
-int __must_check i915_gem_ww_ctx_backoff(struct i915_gem_ww_ctx *ctx);
-void i915_gem_ww_unlock_single(struct drm_i915_gem_object *obj);
-
 #endif /* __I915_GEM_H__ */
drivers/gpu/drm/i915/i915_gem_ww.c new file +63 -0

63 lines not on this page · raw message

drivers/gpu/drm/i915/i915_gem_ww.h new file +21 -0
new file mode 100644
index 000000000000..f2d8769e4118
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+#ifndef __I915_GEM_WW_H__
+#define __I915_GEM_WW_H__
+
+#include <drm/drm_drv.h>
+
+struct i915_gem_ww_ctx {
+	struct ww_acquire_ctx ctx;
+	struct list_head obj_list;
+	struct drm_i915_gem_object *contended;
+	bool intr;
+};
+
+void i915_gem_ww_ctx_init(struct i915_gem_ww_ctx *ctx, bool intr);
+void i915_gem_ww_ctx_fini(struct i915_gem_ww_ctx *ctx);
+int __must_check i915_gem_ww_ctx_backoff(struct i915_gem_ww_ctx *ctx);
+void i915_gem_ww_unlock_single(struct drm_i915_gem_object *obj);
+#endif
Signature · 1 line
2.31.1
#3 lore raw

PATCH v2 3/9 drm/i915: Introduce a ww transaction helper

In reply to Thomas Hellström

Introduce a for_i915_gem_ww(){} utility to help make the code around a ww transaction more readable.

---
 drivers/gpu/drm/i915/i915_gem_ww.h | 31 +++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_ww.h +30 -1
index f2d8769e4118..f6b1a796667b 100644
@@ -11,11 +11,40 @@ struct i915_gem_ww_ctx {
 	struct ww_acquire_ctx ctx;
 	struct list_head obj_list;
 	struct drm_i915_gem_object *contended;
-	bool intr;
+	unsigned short intr;
+	unsigned short loop;
 };
 
 void i915_gem_ww_ctx_init(struct i915_gem_ww_ctx *ctx, bool intr);
 void i915_gem_ww_ctx_fini(struct i915_gem_ww_ctx *ctx);
 int __must_check i915_gem_ww_ctx_backoff(struct i915_gem_ww_ctx *ctx);
 void i915_gem_ww_unlock_single(struct drm_i915_gem_object *obj);
+
+/* Internal functions used by the inlines! Don't use. */
+static inline int __i915_gem_ww_fini(struct i915_gem_ww_ctx *ww, int err)
+{
+	ww->loop = 0;
+	if (err == -EDEADLK) {
+		err = i915_gem_ww_ctx_backoff(ww);
+		if (!err)
+			ww->loop = 1;
+	}
+
+	if (!ww->loop)
+		i915_gem_ww_ctx_fini(ww);
+
+	return err;
+}
+
+static inline void
+__i915_gem_ww_init(struct i915_gem_ww_ctx *ww, bool intr)
+{
+	i915_gem_ww_ctx_init(ww, intr);
+	ww->loop = 1;
+}
+
+#define for_i915_gem_ww(_ww, _err, _intr)			\
+	for (__i915_gem_ww_init(_ww, _intr); (_ww)->loop;	\
+	     _err = __i915_gem_ww_fini(_ww, _err))
+
 #endif
Signature · 1 line
2.31.1
#4 lore raw

PATCH v2 4/9 drm/i915/gt: Add an insert_entry for gen8_ppgtt

In reply to Thomas Hellström

From: Chris Wilson <[email protected]>

In the next patch, we will want to write a PTE for an explicit dma address, outside of the usual vma.

---
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +19 -0
index 21c8b7350b7a..1b676d7700bf 100644
@@ -555,6 +555,24 @@ static void gen8_ppgtt_insert(struct i915_address_space *vm,
 	}
 }
 
+static void gen8_ppgtt_insert_entry(struct i915_address_space *vm,
+				    dma_addr_t addr,
+				    u64 offset,
+				    enum i915_cache_level level,
+				    u32 flags)
+{
+	u64 idx = offset >> GEN8_PTE_SHIFT;
+	struct i915_page_directory * const pdp =
+		gen8_pdp_for_page_index(vm, idx);
+	struct i915_page_directory *pd =
+		i915_pd_entry(pdp, gen8_pd_index(idx, 2));
+	gen8_pte_t *vaddr;
+
+	vaddr = px_vaddr(i915_pt_entry(pd, gen8_pd_index(idx, 1)));
+	vaddr[gen8_pd_index(idx, 0)] = gen8_pte_encode(addr, level, flags);
+	clflush_cache_range(&vaddr[gen8_pd_index(idx, 0)], sizeof(*vaddr));
+}
+
 static int gen8_init_scratch(struct i915_address_space *vm)
 {
 	u32 pte_flags;
@@ -734,6 +752,7 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt)
 
 	ppgtt->vm.bind_async_flags = I915_VMA_LOCAL_BIND;
 	ppgtt->vm.insert_entries = gen8_ppgtt_insert;
+	ppgtt->vm.insert_page = gen8_ppgtt_insert_entry;
 	ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc;
 	ppgtt->vm.clear_range = gen8_ppgtt_clear;
 
Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 4/9
#5 lore raw

Re: [PATCH v2 4/9] drm/i915/gt: Add an insert_entry for gen8_ppgtt

Quoted 6 lines · Thomas Hellström

From: Chris Wilson <[email protected]>

In the next patch, we will want to write a PTE for an explicit dma address, outside of the usual vma.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

PATCH v2 5/9 drm/i915/gt: Add a routine to iterate over the pagetables of a GTT

In reply to Thomas Hellström

From: Chris Wilson <[email protected]>

In the next patch, we will want to look at the dma addresses of individual page tables, so add a routine to iterate over them.

---
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 49 ++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_gtt.h  |  7 ++++
 2 files changed, 56 insertions(+)
drivers/gpu/drm/i915/gt/gen8_ppgtt.c +49 -0
index 1b676d7700bf..3d02c726c746 100644
@@ -361,6 +361,54 @@ static void gen8_ppgtt_alloc(struct i915_address_space *vm,
 			   &start, start + length, vm->top);
 }
 
+static void __gen8_ppgtt_foreach(struct i915_address_space *vm,
+				 struct i915_page_directory *pd,
+				 u64 *start, u64 end, int lvl,
+				 void (*fn)(struct i915_address_space *vm,
+					    struct i915_page_table *pt,
+					    void *data),
+				 void *data)
+{
+	unsigned int idx, len;
+
+	len = gen8_pd_range(*start, end, lvl--, &idx);
+
+	spin_lock(&pd->lock);
+	do {
+		struct i915_page_table *pt = pd->entry[idx];
+
+		atomic_inc(&pt->used);
+		spin_unlock(&pd->lock);
+
+		if (lvl) {
+			__gen8_ppgtt_foreach(vm, as_pd(pt), start, end, lvl,
+					     fn, data);
+		} else {
+			fn(vm, pt, data);
+			*start += gen8_pt_count(*start, end);
+		}
+
+		spin_lock(&pd->lock);
+		atomic_dec(&pt->used);
+	} while (idx++, --len);
+	spin_unlock(&pd->lock);
+}
+
+static void gen8_ppgtt_foreach(struct i915_address_space *vm,
+			       u64 start, u64 length,
+			       void (*fn)(struct i915_address_space *vm,
+					  struct i915_page_table *pt,
+					  void *data),
+			       void *data)
+{
+	start >>= GEN8_PTE_SHIFT;
+	length >>= GEN8_PTE_SHIFT;
+
+	__gen8_ppgtt_foreach(vm, i915_vm_to_ppgtt(vm)->pd,
+			     &start, start + length, vm->top,
+			     fn, data);
+}
+
 static __always_inline u64
 gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt,
 		      struct i915_page_directory *pdp,
@@ -755,6 +803,7 @@ struct i915_ppgtt *gen8_ppgtt_create(struct intel_gt *gt)
 	ppgtt->vm.insert_page = gen8_ppgtt_insert_entry;
 	ppgtt->vm.allocate_va_range = gen8_ppgtt_alloc;
 	ppgtt->vm.clear_range = gen8_ppgtt_clear;
+	ppgtt->vm.foreach = gen8_ppgtt_foreach;
 
 	ppgtt->vm.pte_encode = gen8_pte_encode;
 
drivers/gpu/drm/i915/gt/intel_gtt.h +7 -0
index edea95b97c36..9bd89f2a01ff 100644
@@ -296,6 +296,13 @@ struct i915_address_space {
 			       u32 flags);
 	void (*cleanup)(struct i915_address_space *vm);
 
+	void (*foreach)(struct i915_address_space *vm,
+			u64 start, u64 length,
+			void (*fn)(struct i915_address_space *vm,
+				   struct i915_page_table *pt,
+				   void *data),
+			void *data);
+
 	struct i915_vma_ops vma_ops;
 
 	I915_SELFTEST_DECLARE(struct fault_attr fault_attr);
Signature · 1 line
2.31.1
#8 lore raw

PATCH v2 6/9 drm/i915/gt: Export the pinned context constructor and destructor

In reply to Thomas Hellström

From: Chris Wilson <[email protected]>

Allow internal clients to create and destroy a pinned context.

---
v2:
- (Thomas) Export also the pinned context destructor

---
 drivers/gpu/drm/i915/gt/intel_engine.h    | 11 +++++++++
 drivers/gpu/drm/i915/gt/intel_engine_cs.c | 27 ++++++++++++++---------
 2 files changed, 28 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine.h +11 -0
index 8d9184920c51..36ea9eb52bb5 100644
@@ -19,7 +19,9 @@
 #include "intel_workarounds.h"
 
 struct drm_printer;
+struct intel_context;
 struct intel_gt;
+struct lock_class_key;
 
 /* Early gen2 devices have a cacheline of just 32 bytes, using 64 is overkill,
  * but keeps the logic simple. Indeed, the whole purpose of this macro is just
@@ -256,6 +258,15 @@ struct i915_request *
 intel_engine_find_active_request(struct intel_engine_cs *engine);
 
 u32 intel_engine_context_size(struct intel_gt *gt, u8 class);
+struct intel_context *
+intel_engine_create_pinned_context(struct intel_engine_cs *engine,
+				   struct i915_address_space *vm,
+				   unsigned int ring_size,
+				   unsigned int hwsp,
+				   struct lock_class_key *key,
+				   const char *name);
+
+void intel_engine_destroy_pinned_context(struct intel_context *ce);
 
 void intel_engine_init_active(struct intel_engine_cs *engine,
 			      unsigned int subclass);
drivers/gpu/drm/i915/gt/intel_engine_cs.c +17 -10
index 9ceddfbb1687..fcbaad18ac91 100644
@@ -810,11 +810,13 @@ intel_engine_init_active(struct intel_engine_cs *engine, unsigned int subclass)
 #endif
 }
 
-static struct intel_context *
-create_pinned_context(struct intel_engine_cs *engine,
-		      unsigned int hwsp,
-		      struct lock_class_key *key,
-		      const char *name)
+struct intel_context *
+intel_engine_create_pinned_context(struct intel_engine_cs *engine,
+				   struct i915_address_space *vm,
+				   unsigned int ring_size,
+				   unsigned int hwsp,
+				   struct lock_class_key *key,
+				   const char *name)
 {
 	struct intel_context *ce;
 	int err;
@@ -825,6 +827,10 @@ create_pinned_context(struct intel_engine_cs *engine,
 
 	__set_bit(CONTEXT_BARRIER_BIT, &ce->flags);
 	ce->timeline = page_pack_bits(NULL, hwsp);
+	ce->ring = __intel_context_ring_size(ring_size);
+
+	i915_vm_put(ce->vm);
+	ce->vm = i915_vm_get(vm);
 
 	err = intel_context_pin(ce); /* perma-pin so it is always available */
 	if (err) {
@@ -843,7 +849,7 @@ create_pinned_context(struct intel_engine_cs *engine,
 	return ce;
 }
 
-static void destroy_pinned_context(struct intel_context *ce)
+void intel_engine_destroy_pinned_context(struct intel_context *ce)
 {
 	struct intel_engine_cs *engine = ce->engine;
 	struct i915_vma *hwsp = engine->status_page.vma;
@@ -863,8 +869,9 @@ create_kernel_context(struct intel_engine_cs *engine)
 {
 	static struct lock_class_key kernel;
 
-	return create_pinned_context(engine, I915_GEM_HWS_SEQNO_ADDR,
-				     &kernel, "kernel_context");
+	return intel_engine_create_pinned_context(engine, engine->gt->vm, SZ_4K,
+						  I915_GEM_HWS_SEQNO_ADDR,
+						  &kernel, "kernel_context");
 }
 
 /**
@@ -907,7 +914,7 @@ static int engine_init_common(struct intel_engine_cs *engine)
 	return 0;
 
 err_context:
-	destroy_pinned_context(ce);
+	intel_engine_destroy_pinned_context(ce);
 	return ret;
 }
 
@@ -969,7 +976,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)
 		fput(engine->default_state);
 
 	if (engine->kernel_context)
-		destroy_pinned_context(engine->kernel_context);
+		intel_engine_destroy_pinned_context(engine->kernel_context);
 
 	GEM_BUG_ON(!llist_empty(&engine->barrier_tasks));
 	cleanup_status_page(engine);
Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 6/9
#9 lore raw

Re: [PATCH v2 6/9] drm/i915/gt: Export the pinned context constructor and destructor

Quoted 5 lines · Thomas Hellström

From: Chris Wilson <[email protected]>

Allow internal clients to create and destroy a pinned context.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

PATCH v2 7/9 drm/i915/gt: Pipelined page migration

In reply to Thomas Hellström

From: Chris Wilson <[email protected]>

If we pipeline the PTE updates and then do the copy of those pages within a single unpreemptible command packet, we can submit the copies and leave them to be scheduled without having to synchronously wait under a global lock. In order to manage migration, we need to preallocate the page tables (and keep them pinned and available for use at any time), causing a bottleneck for migrations as all clients must contend on the limited resources. By inlining the ppGTT updates and performing the blit atomically, each client only owns the PTE while in use, and so we can reschedule individual operations however we see fit. And most importantly, we do not need to take a global lock on the shared vm, and wait until the operation is complete before releasing the lock for others to claim the PTE for themselves.

---
v2:
- Add a TODO for huge LMEM ptes (Pointed out by Matthew Auld)
- Use intel_engine_destroy_pinned_context() to properly take the pinned context timeline off the engine list. (CI warning).

---
 drivers/gpu/drm/i915/Makefile                 |   1 +
 drivers/gpu/drm/i915/gt/intel_engine.h        |   1 +
 drivers/gpu/drm/i915/gt/intel_gpu_commands.h  |   2 +
 drivers/gpu/drm/i915/gt/intel_migrate.c       | 544 ++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_migrate.h       |  45 ++
 drivers/gpu/drm/i915/gt/intel_migrate_types.h |  15 +
 drivers/gpu/drm/i915/gt/intel_ring.h          |   1 +
 drivers/gpu/drm/i915/gt/selftest_migrate.c    | 291 ++++++++++
 .../drm/i915/selftests/i915_live_selftests.h  |   1 +
 9 files changed, 901 insertions(+)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c
drivers/gpu/drm/i915/Makefile +1 -0
index 16a5a006cf7c..95bd38e84625 100644
@@ -108,6 +108,7 @@ gt-y += \
 	gt/intel_gtt.o \
 	gt/intel_llc.o \
 	gt/intel_lrc.o \
+	gt/intel_migrate.o \
 	gt/intel_mocs.o \
 	gt/intel_ppgtt.o \
 	gt/intel_rc6.o \
drivers/gpu/drm/i915/gt/intel_engine.h +1 -0
index 36ea9eb52bb5..62f7440bc111 100644
@@ -188,6 +188,7 @@ intel_write_status_page(struct intel_engine_cs *engine, int reg, u32 value)
 #define I915_GEM_HWS_PREEMPT_ADDR	(I915_GEM_HWS_PREEMPT * sizeof(u32))
 #define I915_GEM_HWS_SEQNO		0x40
 #define I915_GEM_HWS_SEQNO_ADDR		(I915_GEM_HWS_SEQNO * sizeof(u32))
+#define I915_GEM_HWS_MIGRATE		(0x42 * sizeof(u32))
 #define I915_GEM_HWS_SCRATCH		0x80
 
 #define I915_HWS_CSB_BUF0_INDEX		0x10
drivers/gpu/drm/i915/gt/intel_gpu_commands.h +2 -0
index 2694dbb9967e..1c3af0fc0456 100644
@@ -123,8 +123,10 @@
 #define   MI_SEMAPHORE_SAD_NEQ_SDD	(5 << 12)
 #define   MI_SEMAPHORE_TOKEN_MASK	REG_GENMASK(9, 5)
 #define   MI_SEMAPHORE_TOKEN_SHIFT	5
+#define MI_STORE_DATA_IMM	MI_INSTR(0x20, 0)
 #define MI_STORE_DWORD_IMM	MI_INSTR(0x20, 1)
 #define MI_STORE_DWORD_IMM_GEN4	MI_INSTR(0x20, 2)
+#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21))
 #define   MI_MEM_VIRTUAL	(1 << 22) /* 945,g33,965 */
 #define   MI_USE_GGTT		(1 << 22) /* g4x+ */
 #define MI_STORE_DWORD_INDEX	MI_INSTR(0x21, 1)
drivers/gpu/drm/i915/gt/intel_migrate.c new file +544 -0

544 lines not on this page · raw message

drivers/gpu/drm/i915/gt/intel_migrate.h new file +45 -0

45 lines not on this page · raw message

drivers/gpu/drm/i915/gt/intel_migrate_types.h new file +15 -0
new file mode 100644
index 000000000000..d98230597f42
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#ifndef __INTEL_MIGRATE_TYPES__
+#define __INTEL_MIGRATE_TYPES__
+
+struct intel_context;
+
+struct intel_migrate {
+	struct intel_context *context;
+};
+
+#endif /* __INTEL_MIGRATE_TYPES__ */
drivers/gpu/drm/i915/gt/intel_ring.h +1 -0
index dbf5f14a136f..1b32dadfb8c3 100644
@@ -49,6 +49,7 @@ static inline void intel_ring_advance(struct i915_request *rq, u32 *cs)
 	 * intel_ring_begin()).
 	 */
 	GEM_BUG_ON((rq->ring->vaddr + rq->ring->emit) != cs);
+	GEM_BUG_ON(!IS_ALIGNED(rq->ring->emit, 8)); /* RING_TAIL qword align */
 }
 
 static inline u32 intel_ring_wrap(const struct intel_ring *ring, u32 pos)
drivers/gpu/drm/i915/gt/selftest_migrate.c new file +291 -0

291 lines not on this page · raw message

drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -0
index a92c0e9b7e6b..be5e0191eaea 100644
@@ -26,6 +26,7 @@ selftest(gt_mocs, intel_mocs_live_selftests)
 selftest(gt_pm, intel_gt_pm_live_selftests)
 selftest(gt_heartbeat, intel_heartbeat_live_selftests)
 selftest(requests, i915_request_live_selftests)
+selftest(migrate, intel_migrate_live_selftests)
 selftest(active, i915_active_live_selftests)
 selftest(objects, i915_gem_object_live_selftests)
 selftest(mman, i915_gem_mman_live_selftests)
Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

Re: [PATCH v2 7/9] drm/i915/gt: Pipelined page migration

Quoted 190 lines · Thomas Hellström

From: Chris Wilson <[email protected]>

If we pipeline the PTE updates and then do the copy of those pages within a single unpreemptible command packet, we can submit the copies and leave them to be scheduled without having to synchronously wait under a global lock. In order to manage migration, we need to preallocate the page tables (and keep them pinned and available for use at any time), causing a bottleneck for migrations as all clients must contend on the limited resources. By inlining the ppGTT updates and performing the blit atomically, each client only owns the PTE while in use, and so we can reschedule individual operations however we see fit. And most importantly, we do not need to take a global lock on the shared vm, and wait until the operation is complete before releasing the lock for others to claim the PTE for themselves.

---
v2:
- Add a TODO for huge LMEM ptes (Pointed out by Matthew Auld)
- Use intel_engine_destroy_pinned_context() to properly take the pinned context timeline off the engine list. (CI warning).

---
  drivers/gpu/drm/i915/Makefile                 |   1 +
  drivers/gpu/drm/i915/gt/intel_engine.h        |   1 +
  drivers/gpu/drm/i915/gt/intel_gpu_commands.h  |   2 +
  drivers/gpu/drm/i915/gt/intel_migrate.c       | 544 ++++++++++++++++++
  drivers/gpu/drm/i915/gt/intel_migrate.h       |  45 ++
  drivers/gpu/drm/i915/gt/intel_migrate_types.h |  15 +
  drivers/gpu/drm/i915/gt/intel_ring.h          |   1 +
  drivers/gpu/drm/i915/gt/selftest_migrate.c    | 291 ++++++++++
  .../drm/i915/selftests/i915_live_selftests.h  |   1 +
  9 files changed, 901 insertions(+)

create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c

drivers/gpu/drm/i915/Makefile +1 -0
index 16a5a006cf7c..95bd38e84625 100644
@@ -108,6 +108,7 @@ gt-y += \
  	gt/intel_gtt.o \
  	gt/intel_llc.o \
  	gt/intel_lrc.o \
+	gt/intel_migrate.o \
  	gt/intel_mocs.o \
  	gt/intel_ppgtt.o \
  	gt/intel_rc6.o \
drivers/gpu/drm/i915/gt/intel_engine.h +1 -0
index 36ea9eb52bb5..62f7440bc111 100644
@@ -188,6 +188,7 @@ intel_write_status_page(struct intel_engine_cs *engine, int reg, u32 value)
  #define I915_GEM_HWS_PREEMPT_ADDR	(I915_GEM_HWS_PREEMPT * sizeof(u32))
  #define I915_GEM_HWS_SEQNO		0x40
  #define I915_GEM_HWS_SEQNO_ADDR		(I915_GEM_HWS_SEQNO * sizeof(u32))
+#define I915_GEM_HWS_MIGRATE		(0x42 * sizeof(u32))
  #define I915_GEM_HWS_SCRATCH		0x80
 
  #define I915_HWS_CSB_BUF0_INDEX		0x10
drivers/gpu/drm/i915/gt/intel_gpu_commands.h +2 -0
index 2694dbb9967e..1c3af0fc0456 100644
@@ -123,8 +123,10 @@
  #define   MI_SEMAPHORE_SAD_NEQ_SDD	(5 << 12)
  #define   MI_SEMAPHORE_TOKEN_MASK	REG_GENMASK(9, 5)
  #define   MI_SEMAPHORE_TOKEN_SHIFT	5
+#define MI_STORE_DATA_IMM	MI_INSTR(0x20, 0)
  #define MI_STORE_DWORD_IMM	MI_INSTR(0x20, 1)
  #define MI_STORE_DWORD_IMM_GEN4	MI_INSTR(0x20, 2)
+#define MI_STORE_QWORD_IMM_GEN8 (MI_INSTR(0x20, 3) | REG_BIT(21))
  #define   MI_MEM_VIRTUAL	(1 << 22) /* 945,g33,965 */
  #define   MI_USE_GGTT		(1 << 22) /* g4x+ */
  #define MI_STORE_DWORD_INDEX	MI_INSTR(0x21, 1)
drivers/gpu/drm/i915/gt/intel_migrate.c new file +106 -0
new file mode 100644
index 000000000000..70776316863d
@@ -0,0 +1,544 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#include "i915_drv.h"
+#include "intel_context.h"
+#include "intel_gpu_commands.h"
+#include "intel_gt.h"
+#include "intel_gtt.h"
+#include "intel_migrate.h"
+#include "intel_ring.h"
+
+struct insert_pte_data {
+	u64 offset;
+	bool is_lmem;
+};
+
+#define CHUNK_SZ SZ_8M /* ~1ms at 8GiB/s preemption delay */
+
+static bool engine_supports_migration(struct intel_engine_cs *engine)
+{
+	if (!engine)
+		return false;
+
+	/*
+	 * We need the ability to prevent aribtration (MI_ARB_ON_OFF),
+	 * the ability to write PTE using inline data (MI_STORE_DATA)
+	 * and of course the ability to do the block transfer (blits).
+	 */
+	GEM_BUG_ON(engine->class != COPY_ENGINE_CLASS);
+
+	return true;
+}
+
+static void insert_pte(struct i915_address_space *vm,
+		       struct i915_page_table *pt,
+		       void *data)
+{
+	struct insert_pte_data *d = data;
+
+	vm->insert_page(vm, px_dma(pt), d->offset, I915_CACHE_NONE,
+			d->is_lmem ? PTE_LM : 0);
+	d->offset += PAGE_SIZE;
+}
+
+static struct i915_address_space *migrate_vm(struct intel_gt *gt)
+{
+	struct i915_vm_pt_stash stash = {};
+	struct i915_ppgtt *vm;
+	int err;
+	int i;
+
+	/*
+	 * We construct a very special VM for use by all migration contexts,
+	 * it is kept pinned so that it can be used at any time. As we need
+	 * to pre-allocate the page directories for the migration VM, this
+	 * limits us to only using a small number of prepared vma.
+	 *
+	 * To be able to pipeline and reschedule migration operations while
+	 * avoiding unnecessary contention on the vm itself, the PTE updates
+	 * are inline with the blits. All the blits use the same fixed
+	 * addresses, with the backing store redirection being updated on the
+	 * fly. Only 2 implicit vma are used for all migration operations.
+	 *
+	 * We lay the ppGTT out as:
+	 *
+	 *	[0, CHUNK_SZ) -> first object
+	 *	[CHUNK_SZ, 2 * CHUNK_SZ) -> second object
+	 *	[2 * CHUNK_SZ, 2 * CHUNK_SZ + 2 * CHUNK_SZ >> 9] -> PTE
+	 *
+	 * By exposing the dma addresses of the page directories themselves
+	 * within the ppGTT, we are then able to rewrite the PTE prior to use.
+	 * But the PTE update and subsequent migration operation must be atomic,
+	 * i.e. within the same non-preemptible window so that we do not switch
+	 * to another migration context that overwrites the PTE.
+	 *
+	 * TODO: Add support for huge LMEM PTEs
+	 */
+
+	vm = i915_ppgtt_create(gt);
+	if (IS_ERR(vm))
+		return ERR_CAST(vm);
+
+	if (!vm->vm.allocate_va_range || !vm->vm.foreach) {
+		err = -ENODEV;
+		goto err_vm;
+	}
+
+	/*
+	 * Each engine instance is assigned its own chunk in the VM, so
+	 * that we can run multiple instances concurrently
+	 */
+	for (i = 0; i < ARRAY_SIZE(gt->engine_class[COPY_ENGINE_CLASS]); i++) {
+		struct intel_engine_cs *engine;
+		u64 base = (u64)i << 32;
+		struct insert_pte_data d = {};
+		struct i915_gem_ww_ctx ww;
+		u64 sz;
+
+		engine = gt->engine_class[COPY_ENGINE_CLASS][i];
+		if (!engine_supports_migration(engine))
+			continue;
+
+		/*
+		 * We copy in 8MiB chunks. Each PDE covers 2MiB, so we need

drivers/gpu/drm/i915/gt/intel_migrate.c line 116

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +10 -0
+		 * 4x2 page directories for source/destination.
+		 */
+		sz = 2 * CHUNK_SZ;
+		d.offset = base + sz;
+
+		/*
+		 * We need another page directory setup so that we can write
+		 * the 8x512 PTE in each chunk.
+		 */
+		sz += (sz >> 12) * sizeof(u64);

That was quite the mind warp.

Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +4 -0
+
+		err = i915_vm_alloc_pt_stash(&vm->vm, &stash, sz);
+		if (err)
+			goto err_vm;

drivers/gpu/drm/i915/gt/intel_migrate.c line 130

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +10 -0
+
+		for_i915_gem_ww(&ww, err, true) {
+			err = i915_vm_lock_objects(&vm->vm, &ww);
+			if (err)
+				continue;
+			err = i915_vm_map_pt_stash(&vm->vm, &stash);
+			if (err)
+				continue;
+
+			vm->vm.allocate_va_range(&vm->vm, &stash, base, base + sz);

I think here we meant:
allocate_va_range(.., base, sz)

Otherwise this might explode for instance > 0? Since the preallocated stash is too small.

Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +7 -0
+		}
+		i915_vm_free_pt_stash(&vm->vm, &stash);
+		if (err)
+			goto err_vm;
+
+		/* Now allow the GPU to rewrite the PTE via its own ppGTT */
+		d.is_lmem = i915_gem_object_is_lmem(vm->vm.scratch[0]);

drivers/gpu/drm/i915/gt/intel_migrate.c line 147

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +10 -0
+		vm->vm.foreach(&vm->vm, base, base + sz, insert_pte, &d);
+	}
+
+	return &vm->vm;
+
+err_vm:
+	i915_vm_put(&vm->vm);
+	return ERR_PTR(err);
+}
+

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw

Re: [PATCH v2 7/9] drm/i915/gt: Pipelined page migration

In reply to Thomas Hellström
Quoted 24 lines · Thomas Hellström

From: Chris Wilson <[email protected]>

If we pipeline the PTE updates and then do the copy of those pages within a single unpreemptible command packet, we can submit the copies and leave them to be scheduled without having to synchronously wait under a global lock. In order to manage migration, we need to preallocate the page tables (and keep them pinned and available for use at any time), causing a bottleneck for migrations as all clients must contend on the limited resources. By inlining the ppGTT updates and performing the blit atomically, each client only owns the PTE while in use, and so we can reschedule individual operations however we see fit. And most importantly, we do not need to take a global lock on the shared vm, and wait until the operation is complete before releasing the lock for others to claim the PTE for themselves.

---
v2:
- Add a TODO for huge LMEM ptes (Pointed out by Matthew Auld)
- Use intel_engine_destroy_pinned_context() to properly take the pinned context timeline off the engine list. (CI warning).
---

<snip>

Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +9 -0
+
+int
+intel_context_migrate_copy(struct intel_context *ce,
+			   struct dma_fence *await,
+			   struct scatterlist *src,
+			   enum i915_cache_level src_cache_level,
+			   bool src_is_lmem,
+			   struct scatterlist *dst,
+			   enum i915_cache_level dst_cache_level,

drivers/gpu/drm/i915/gt/intel_migrate.c line 423

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +10 -0
+			   bool dst_is_lmem,
+			   struct i915_request **out)
+{
+	struct sgt_dma it_src = sg_sgt(src), it_dst = sg_sgt(dst);
+	struct i915_request *rq;
+	int err;
+
+	*out = NULL;
+
+	/* GEM_BUG_ON(ce->vm != migrate_vm); */

Should we drop this?

Quoted 69 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +69 -0
+
+	GEM_BUG_ON(ce->ring->size < SZ_64K);
+
+	do {
+		int len;
+
+		rq = i915_request_create(ce);
+		if (IS_ERR(rq)) {
+			err = PTR_ERR(rq);
+			goto out_ce;
+		}
+
+		if (await) {
+			err = i915_request_await_dma_fence(rq, await);
+			if (err)
+				goto out_rq;
+
+			if (rq->engine->emit_init_breadcrumb) {
+				err = rq->engine->emit_init_breadcrumb(rq);
+				if (err)
+					goto out_rq;
+			}
+
+			await = NULL;
+		}
+
+		/* The PTE updates + copy must not be interrupted. */
+		err = emit_no_arbitration(rq);
+		if (err)
+			goto out_rq;
+
+		len = emit_pte(rq, &it_src, src_cache_level, src_is_lmem, 0,
+			       CHUNK_SZ);
+		if (len <= 0) {
+			err = len;
+			goto out_rq;
+		}
+
+		err = emit_pte(rq, &it_dst, dst_cache_level, dst_is_lmem,
+			       CHUNK_SZ, len);
+		if (err < 0)
+			goto out_rq;
+		if (err < len) {
+			err = -EINVAL;
+			goto out_rq;
+		}
+
+		err = rq->engine->emit_flush(rq, EMIT_INVALIDATE);
+		if (err)
+			goto out_rq;
+
+		err = emit_copy(rq, len);
+
+		/* Arbitration is re-enabled between requests. */
+out_rq:
+		if (*out)
+			i915_request_put(*out);
+		*out = i915_request_get(rq);
+		i915_request_add(rq);
+		if (err || !it_src.sg || !sg_dma_len(it_src.sg))
+			break;
+
+		cond_resched();
+	} while (1);
+
+out_ce:
+	return err;
+}
+
#13 lore raw

PATCH v2 8/9 drm/i915/gt: Pipelined clear

In reply to Thomas Hellström

From: Chris Wilson <[email protected]>

Update the PTE and emit a clear within a single unpreemptible packet such that we can schedule and pipeline clears.

---
 drivers/gpu/drm/i915/gt/intel_migrate.c    | 141 ++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_migrate.h    |  20 +++
 drivers/gpu/drm/i915/gt/selftest_migrate.c | 163 +++++++++++++++++++++
 3 files changed, 324 insertions(+)
drivers/gpu/drm/i915/gt/intel_migrate.c +141 -0
index 70776316863d..fda05ce3eb9c 100644
@@ -490,6 +490,112 @@ intel_context_migrate_copy(struct intel_context *ce,
 	return err;
 }
 
+static int emit_clear(struct i915_request *rq, int size, u32 value)
+{
+	const int gen = INTEL_GEN(rq->engine->i915);
+	u32 *cs;
+
+	GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX);
+
+	cs = intel_ring_begin(rq, gen >= 8 ? 8 : 6);
+	if (IS_ERR(cs))
+		return PTR_ERR(cs);
+
+	if (gen >= 8) {
+		*cs++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (7 - 2);
+		*cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;
+		*cs++ = 0;
+		*cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+		*cs++ = 0; /* offset */
+		*cs++ = 0;
+		*cs++ = value;
+		*cs++ = MI_NOOP;
+	} else {
+		*cs++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (6 - 2);
+		*cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;
+		*cs++ = 0;
+		*cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+		*cs++ = 0;
+		*cs++ = value;
+	}
+
+	intel_ring_advance(rq, cs);
+	return 0;
+}
+
+int
+intel_context_migrate_clear(struct intel_context *ce,
+			    struct dma_fence *await,
+			    struct scatterlist *sg,
+			    enum i915_cache_level cache_level,
+			    bool is_lmem,
+			    u32 value,
+			    struct i915_request **out)
+{
+	struct sgt_dma it = sg_sgt(sg);
+	struct i915_request *rq;
+	int err;
+
+	*out = NULL;
+
+	GEM_BUG_ON(ce->ring->size < SZ_64K);
+
+	do {
+		int len;
+
+		rq = i915_request_create(ce);
+		if (IS_ERR(rq)) {
+			err = PTR_ERR(rq);
+			goto out_ce;
+		}
+
+		if (await) {
+			err = i915_request_await_dma_fence(rq, await);
+			if (err)
+				goto out_rq;
+
+			if (rq->engine->emit_init_breadcrumb) {
+				err = rq->engine->emit_init_breadcrumb(rq);
+				if (err)
+					goto out_rq;
+			}
+
+			await = NULL;
+		}
+
+		/* The PTE updates + clear must not be interrupted. */
+		err = emit_no_arbitration(rq);
+		if (err)
+			goto out_rq;
+
+		len = emit_pte(rq, &it, cache_level, is_lmem, 0, CHUNK_SZ);
+		if (len <= 0) {
+			err = len;
+			goto out_rq;
+		}
+
+		err = rq->engine->emit_flush(rq, EMIT_INVALIDATE);
+		if (err)
+			goto out_rq;
+
+		err = emit_clear(rq, len, value);
+
+		/* Arbitration is re-enabled between requests. */
+out_rq:
+		if (*out)
+			i915_request_put(*out);
+		*out = i915_request_get(rq);
+		i915_request_add(rq);
+		if (err || !it.sg || !sg_dma_len(it.sg))
+			break;
+
+		cond_resched();
+	} while (1);
+
+out_ce:
+	return err;
+}
+
 int intel_migrate_copy(struct intel_migrate *m,
 		       struct i915_gem_ww_ctx *ww,
 		       struct dma_fence *await,
@@ -528,6 +634,41 @@ int intel_migrate_copy(struct intel_migrate *m,
 	return err;
 }
 
+int
+intel_migrate_clear(struct intel_migrate *m,
+		    struct i915_gem_ww_ctx *ww,
+		    struct dma_fence *await,
+		    struct scatterlist *sg,
+		    enum i915_cache_level cache_level,
+		    bool is_lmem,
+		    u32 value,
+		    struct i915_request **out)
+{
+	struct intel_context *ce;
+	int err;
+
+	*out = NULL;
+	if (!m->context)
+		return -ENODEV;
+
+	ce = intel_migrate_create_context(m);
+	if (IS_ERR(ce))
+		ce = intel_context_get(m->context);
+	GEM_BUG_ON(IS_ERR(ce));
+
+	err = intel_context_pin_ww(ce, ww);
+	if (err)
+		goto out;
+
+	err = intel_context_migrate_clear(ce, await, sg, cache_level,
+					  is_lmem, value, out);
+
+	intel_context_unpin(ce);
+out:
+	intel_context_put(ce);
+	return err;
+}
+
 void intel_migrate_fini(struct intel_migrate *m)
 {
 	struct intel_context *ce;
drivers/gpu/drm/i915/gt/intel_migrate.h +20 -0
index 32c61190ed73..4e18e755a00b 100644
@@ -6,6 +6,8 @@
 #ifndef __INTEL_MIGRATE__
 #define __INTEL_MIGRATE__
 
+#include <linux/types.h>
+
 #include "intel_migrate_types.h"
 
 struct dma_fence;
@@ -40,6 +42,24 @@ int intel_context_migrate_copy(struct intel_context *ce,
 			       bool dst_is_lmem,
 			       struct i915_request **out);
 
+int
+intel_migrate_clear(struct intel_migrate *m,
+		    struct i915_gem_ww_ctx *ww,
+		    struct dma_fence *await,
+		    struct scatterlist *sg,
+		    enum i915_cache_level cache_level,
+		    bool is_lmem,
+		    u32 value,
+		    struct i915_request **out);
+int
+intel_context_migrate_clear(struct intel_context *ce,
+			    struct dma_fence *await,
+			    struct scatterlist *sg,
+			    enum i915_cache_level cache_level,
+			    bool is_lmem,
+			    u32 value,
+			    struct i915_request **out);
+
 void intel_migrate_fini(struct intel_migrate *m);
 
 #endif /* __INTEL_MIGRATE__ */
drivers/gpu/drm/i915/gt/selftest_migrate.c +163 -0

193 lines not on this page · raw message

Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#14 lore raw

Re: [PATCH v2 8/9] drm/i915/gt: Pipelined clear

Quoted 30 lines · Thomas Hellström

From: Chris Wilson <[email protected]>

Update the PTE and emit a clear within a single unpreemptible packet such that we can schedule and pipeline clears.

---
  drivers/gpu/drm/i915/gt/intel_migrate.c    | 141 ++++++++++++++++++
  drivers/gpu/drm/i915/gt/intel_migrate.h    |  20 +++
  drivers/gpu/drm/i915/gt/selftest_migrate.c | 163 +++++++++++++++++++++
  3 files changed, 324 insertions(+)
drivers/gpu/drm/i915/gt/intel_migrate.c +8 -0
index 70776316863d..fda05ce3eb9c 100644
@@ -490,6 +490,112 @@ intel_context_migrate_copy(struct intel_context *ce,
  	return err;
  }
 
+static int emit_clear(struct i915_request *rq, int size, u32 value)
+{
+	const int gen = INTEL_GEN(rq->engine->i915);
+	u32 *cs;
+
+	GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX);
+
+	cs = intel_ring_begin(rq, gen >= 8 ? 8 : 6);

drivers/gpu/drm/i915/gt/intel_migrate.c intel_context_migrate_copy(struct intel_context *ce, · line 510

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c +10 -0
+	if (IS_ERR(cs))
+		return PTR_ERR(cs);
+
+	if (gen >= 8) {
+		*cs++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (7 - 2);
+		*cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;
+		*cs++ = 0;
+		*cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+		*cs++ = 0; /* offset */
+		*cs++ = 0;

Missing feeding the engine instance into the upper dword for the offset?

Quoted 15 lines
drivers/gpu/drm/i915/gt/intel_migrate.c +15 -0
+		*cs++ = value;
+		*cs++ = MI_NOOP;
+	} else {
+		*cs++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (6 - 2);
+		*cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;
+		*cs++ = 0;
+		*cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+		*cs++ = 0;
+		*cs++ = value;
+	}
+
+	intel_ring_advance(rq, cs);
+	return 0;
+}
+
#15 lore raw

PATCH v2 9/9 drm/i915/gt: Setup a default migration context on the GT

In reply to Thomas Hellström

From: Chris Wilson <[email protected]>

Set up a default migration context on the GT and use it from the selftests.
Add a perf selftest and make sure we exercise LMEM if available.

---
 drivers/gpu/drm/i915/gt/intel_gt.c            |   4 +
 drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
 drivers/gpu/drm/i915/gt/intel_migrate.c       |   4 +-
 drivers/gpu/drm/i915/gt/selftest_migrate.c    | 227 +++++++++++++++++-
 .../drm/i915/selftests/i915_perf_selftests.h  |   1 +
 5 files changed, 232 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +4 -0
index 2161bf01ef8b..67ef057ae918 100644
@@ -13,6 +13,7 @@
 #include "intel_gt_clock_utils.h"
 #include "intel_gt_pm.h"
 #include "intel_gt_requests.h"
+#include "intel_migrate.h"
 #include "intel_mocs.h"
 #include "intel_rc6.h"
 #include "intel_renderstate.h"
@@ -626,6 +627,8 @@ int intel_gt_init(struct intel_gt *gt)
 	if (err)
 		goto err_gt;
 
+	intel_migrate_init(&gt->migrate, gt);
+
 	goto out_fw;
 err_gt:
 	__intel_gt_disable(gt);
@@ -649,6 +652,7 @@ void intel_gt_driver_remove(struct intel_gt *gt)
 {
 	__intel_gt_disable(gt);
 
+	intel_migrate_fini(&gt->migrate);
 	intel_uc_driver_remove(&gt->uc);
 
 	intel_engines_release(gt);
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
index fecfacf551d5..7450935f2ca8 100644
@@ -24,6 +24,7 @@
 #include "intel_reset_types.h"
 #include "intel_rc6_types.h"
 #include "intel_rps_types.h"
+#include "intel_migrate_types.h"
 #include "intel_wakeref.h"
 
 struct drm_i915_private;
@@ -145,6 +146,8 @@ struct intel_gt {
 
 	struct i915_vma *scratch;
 
+	struct intel_migrate migrate;
+
 	struct intel_gt_info {
 		intel_engine_mask_t engine_mask;
 		u8 num_engines;
drivers/gpu/drm/i915/gt/intel_migrate.c +2 -2
index fda05ce3eb9c..935b5f14ff21 100644
@@ -418,10 +418,9 @@ intel_context_migrate_copy(struct intel_context *ce,
 	struct i915_request *rq;
 	int err;
 
+	GEM_BUG_ON(ce->vm != ce->engine->gt->migrate.context->vm);
 	*out = NULL;
 
-	/* GEM_BUG_ON(ce->vm != migrate_vm); */
-
 	GEM_BUG_ON(ce->ring->size < SZ_64K);
 
 	do {
@@ -536,6 +535,7 @@ intel_context_migrate_clear(struct intel_context *ce,
 	struct i915_request *rq;
 	int err;
 
+	GEM_BUG_ON(ce->vm != ce->engine->gt->migrate.context->vm);
 	*out = NULL;
 
 	GEM_BUG_ON(ce->ring->size < SZ_64K);
drivers/gpu/drm/i915/gt/selftest_migrate.c +222 -5

242 lines not on this page · raw message

drivers/gpu/drm/i915/selftests/i915_perf_selftests.h +1 -0
index c2389f8a257d..5077dc3c3b8c 100644
@@ -17,5 +17,6 @@
  */
 selftest(engine_cs, intel_engine_cs_perf_selftests)
 selftest(request, i915_request_perf_selftests)
+selftest(migrate, intel_migrate_perf_selftests)
 selftest(blt, i915_gem_object_blt_perf_selftests)
 selftest(region, intel_memory_region_perf_selftests)
Signature · 1 line
2.31.1
Reviewed-by on v2 9/9
#16 lore raw

Re: [PATCH v2 9/9] drm/i915/gt: Setup a default migration context on the GT

Quoted 115 lines · Thomas Hellström

From: Chris Wilson <[email protected]>

Set up a default migration context on the GT and use it from the selftests.
Add a perf selftest and make sure we exercise LMEM if available.

---
  drivers/gpu/drm/i915/gt/intel_gt.c            |   4 +
  drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
  drivers/gpu/drm/i915/gt/intel_migrate.c       |   4 +-
  drivers/gpu/drm/i915/gt/selftest_migrate.c    | 227 +++++++++++++++++-
  .../drm/i915/selftests/i915_perf_selftests.h  |   1 +
  5 files changed, 232 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +4 -0
index 2161bf01ef8b..67ef057ae918 100644
@@ -13,6 +13,7 @@
  #include "intel_gt_clock_utils.h"
  #include "intel_gt_pm.h"
  #include "intel_gt_requests.h"
+#include "intel_migrate.h"
  #include "intel_mocs.h"
  #include "intel_rc6.h"
  #include "intel_renderstate.h"
@@ -626,6 +627,8 @@ int intel_gt_init(struct intel_gt *gt)
  	if (err)
  		goto err_gt;
 
+	intel_migrate_init(&gt->migrate, gt);
+
  	goto out_fw;
  err_gt:
  	__intel_gt_disable(gt);
@@ -649,6 +652,7 @@ void intel_gt_driver_remove(struct intel_gt *gt)
  {
  	__intel_gt_disable(gt);
 
+	intel_migrate_fini(&gt->migrate);
  	intel_uc_driver_remove(&gt->uc);
 
  	intel_engines_release(gt);
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
index fecfacf551d5..7450935f2ca8 100644
@@ -24,6 +24,7 @@
  #include "intel_reset_types.h"
  #include "intel_rc6_types.h"
  #include "intel_rps_types.h"
+#include "intel_migrate_types.h"
  #include "intel_wakeref.h"
 
  struct drm_i915_private;
@@ -145,6 +146,8 @@ struct intel_gt {
 
  	struct i915_vma *scratch;
 
+	struct intel_migrate migrate;
+
  	struct intel_gt_info {
  		intel_engine_mask_t engine_mask;
  		u8 num_engines;
drivers/gpu/drm/i915/gt/intel_migrate.c +2 -2
index fda05ce3eb9c..935b5f14ff21 100644
@@ -418,10 +418,9 @@ intel_context_migrate_copy(struct intel_context *ce,
  	struct i915_request *rq;
  	int err;
 
+	GEM_BUG_ON(ce->vm != ce->engine->gt->migrate.context->vm);
  	*out = NULL;
 
-	/* GEM_BUG_ON(ce->vm != migrate_vm); */
-
  	GEM_BUG_ON(ce->ring->size < SZ_64K);
 
  	do {
@@ -536,6 +535,7 @@ intel_context_migrate_clear(struct intel_context *ce,
  	struct i915_request *rq;
  	int err;
 
+	GEM_BUG_ON(ce->vm != ce->engine->gt->migrate.context->vm);
  	*out = NULL;
 
  	GEM_BUG_ON(ce->ring->size < SZ_64K);
drivers/gpu/drm/i915/gt/selftest_migrate.c +8 -1
index 159c8656e1b0..396c81364399 100644
@@ -3,6 +3,8 @@
   * Copyright © 2020 Intel Corporation
   */
 
+#include <linux/sort.h>
+
  #include "selftests/i915_random.h"
 
  static const unsigned int sizes[] = {
@@ -441,14 +443,229 @@ int intel_migrate_live_selftests(struct drm_i915_private *i915)
  		SUBTEST(thread_global_copy),
  		SUBTEST(thread_global_clear),
  	};
-	struct intel_migrate m;
+	struct intel_gt *gt = &i915->gt;
+
+	if (!gt->migrate.context)
+		return 0;
+
+	return i915_subtests(tests, &gt->migrate);

drivers/gpu/drm/i915/gt/selftest_migrate.c int intel_migrate_live_selftests(struct drm_i915_private *i915) · line 460

Quoted 10 lines
drivers/gpu/drm/i915/gt/selftest_migrate.c +7 -1
+}
+
+static struct drm_i915_gem_object *
+create_init_lmem_internal(struct intel_gt *gt, size_t sz, bool try_lmem)
+{
+	struct drm_i915_gem_object *obj = NULL;
  	int err;
 
-	if (intel_migrate_init(&m, &i915->gt))
+	if (try_lmem && HAS_LMEM(gt->i915))

Could drop the HAS_LMEM()

It's elsewhere in the driver normal to just do:
obj = create_lmem()
if (IS_ERR(obj))
obj = create_internal()

Quoted 226 lines
drivers/gpu/drm/i915/gt/selftest_migrate.c +207 -3
+		obj = i915_gem_object_create_lmem(gt->i915, sz, 0);
+
+	if (IS_ERR_OR_NULL(obj)) {
+		obj = i915_gem_object_create_internal(gt->i915, sz);
+		if (IS_ERR(obj))
+			return obj;
+	}
+
+	i915_gem_object_trylock(obj);
+	err = i915_gem_object_pin_pages(obj);
+	if (err) {
+		i915_gem_object_unlock(obj);
+		i915_gem_object_put(obj);
+		return ERR_PTR(err);
+	}
+
+	return obj;
+}
+
+static int wrap_ktime_compare(const void *A, const void *B)
+{
+	const ktime_t *a = A, *b = B;
+
+	return ktime_compare(*a, *b);
+}
+
+static int __perf_clear_blt(struct intel_context *ce,
+			    struct scatterlist *sg,
+			    enum i915_cache_level cache_level,
+			    bool is_lmem,
+			    size_t sz)
+{
+	ktime_t t[5];
+	int pass;
+	int err = 0;
+
+	for (pass = 0; pass < ARRAY_SIZE(t); pass++) {
+		struct i915_request *rq;
+		ktime_t t0, t1;
+
+		t0 = ktime_get();
+
+		err = intel_context_migrate_clear(ce, NULL, sg, cache_level,
+						  is_lmem, 0, &rq);
+		if (rq) {
+			if (i915_request_wait(rq, 0, MAX_SCHEDULE_TIMEOUT) < 0)
+				err = -EIO;
+			i915_request_put(rq);
+		}
+		if (err)
+			break;
+
+		t1 = ktime_get();
+		t[pass] = ktime_sub(t1, t0);
+	}
+	if (err)
+		return err;
+
+	sort(t, ARRAY_SIZE(t), sizeof(*t), wrap_ktime_compare, NULL);
+	pr_info("%s: %zd KiB fill: %lld MiB/s\n",
+		ce->engine->name, sz >> 10,
+		div64_u64(mul_u32_u32(4 * sz,
+				      1000 * 1000 * 1000),
+			  t[1] + 2 * t[2] + t[3]) >> 20);
+	return 0;
+}
+
+static int perf_clear_blt(void *arg)
+{
+	struct intel_gt *gt = arg;
+	static const unsigned long sizes[] = {
+		SZ_4K,
+		SZ_64K,
+		SZ_2M,
+		SZ_64M
+	};
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(sizes); i++) {
+		struct drm_i915_gem_object *dst;
+		int err;
+
+		dst = create_init_lmem_internal(gt, sizes[i], true);
+		if (IS_ERR(dst))
+			return PTR_ERR(dst);
+
+		err = __perf_clear_blt(gt->migrate.context,
+				       dst->mm.pages->sgl,
+				       I915_CACHE_NONE,
+				       i915_gem_object_is_lmem(dst),
+				       sizes[i]);
+
+		i915_gem_object_unlock(dst);
+		i915_gem_object_put(dst);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+static int __perf_copy_blt(struct intel_context *ce,
+			   struct scatterlist *src,
+			   enum i915_cache_level src_cache_level,
+			   bool src_is_lmem,
+			   struct scatterlist *dst,
+			   enum i915_cache_level dst_cache_level,
+			   bool dst_is_lmem,
+			   size_t sz)
+{
+	ktime_t t[5];
+	int pass;
+	int err = 0;
+
+	for (pass = 0; pass < ARRAY_SIZE(t); pass++) {
+		struct i915_request *rq;
+		ktime_t t0, t1;
+
+		t0 = ktime_get();
+
+		err = intel_context_migrate_copy(ce, NULL,
+						 src, src_cache_level,
+						 src_is_lmem,
+						 dst, dst_cache_level,
+						 dst_is_lmem,
+						 &rq);
+		if (rq) {
+			if (i915_request_wait(rq, 0, MAX_SCHEDULE_TIMEOUT) < 0)
+				err = -EIO;
+			i915_request_put(rq);
+		}
+		if (err)
+			break;
+
+		t1 = ktime_get();
+		t[pass] = ktime_sub(t1, t0);
+	}
+	if (err)
+		return err;
+
+	sort(t, ARRAY_SIZE(t), sizeof(*t), wrap_ktime_compare, NULL);
+	pr_info("%s: %zd KiB copy: %lld MiB/s\n",
+		ce->engine->name, sz >> 10,
+		div64_u64(mul_u32_u32(4 * sz,
+				      1000 * 1000 * 1000),
+			  t[1] + 2 * t[2] + t[3]) >> 20);
+	return 0;
+}
+
+static int perf_copy_blt(void *arg)
+{
+	struct intel_gt *gt = arg;
+	static const unsigned long sizes[] = {
+		SZ_4K,
+		SZ_64K,
+		SZ_2M,
+		SZ_64M
+	};
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(sizes); i++) {
+		struct drm_i915_gem_object *src, *dst;
+		int err;
+
+		src = create_init_lmem_internal(gt, sizes[i], true);
+		if (IS_ERR(src))
+			return PTR_ERR(src);
+
+		dst = create_init_lmem_internal(gt, sizes[i], false);
+		if (IS_ERR(dst)) {
+			err = PTR_ERR(dst);
+			goto err_src;
+		}
+
+		err = __perf_copy_blt(gt->migrate.context,
+				      src->mm.pages->sgl,
+				      I915_CACHE_NONE,
+				      i915_gem_object_is_lmem(src),
+				      dst->mm.pages->sgl,
+				      I915_CACHE_NONE,
+				      i915_gem_object_is_lmem(dst),
+				      sizes[i]);
+
+		i915_gem_object_unlock(dst);
+		i915_gem_object_put(dst);
+err_src:
+		i915_gem_object_unlock(src);
+		i915_gem_object_put(src);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
+int intel_migrate_perf_selftests(struct drm_i915_private *i915)
+{
+	static const struct i915_subtest tests[] = {
+		SUBTEST(perf_clear_blt),
+		SUBTEST(perf_copy_blt),
+	};
+	struct intel_gt *gt = &i915->gt;
+
+	if (intel_gt_is_wedged(gt))
  		return 0;
 
-	err = i915_subtests(tests, &m);
-	intel_migrate_fini(&m);
+	if (!gt->migrate.context)
+		return 0;
 
-	return err;
+	return intel_gt_live_subtests(tests, gt);
  }
drivers/gpu/drm/i915/selftests/i915_perf_selftests.h +1 -0
index c2389f8a257d..5077dc3c3b8c 100644
@@ -17,5 +17,6 @@
   */
  selftest(engine_cs, intel_engine_cs_perf_selftests)
  selftest(request, i915_request_perf_selftests)
+selftest(migrate, intel_migrate_perf_selftests)
  selftest(blt, i915_gem_object_blt_perf_selftests)
  selftest(region, intel_memory_region_perf_selftests)
#17 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Prereqs for TTM accelerated migration (rev2)

In reply to Thomas Hellström
== Series Details ==

== Series Details ==

Series: Prereqs for TTM accelerated migration (rev2)
URL : https://patchwork.freedesktop.org/series/91155/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
be1926db749f drm/i915: Reference objects on the ww object list
ae3f71f8fc2d drm/i915: Break out dma_resv ww locking utilities to separate files
-:141: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#141: 
new file mode 100644

-:166: WARNING:LONG_LINE: line length of 103 exceeds 100 columns #166: FILE: drivers/gpu/drm/i915/i915_gem_ww.c:21:
+ while ((obj = list_first_entry_or_null(&ww->obj_list, struct drm_i915_gem_object, obj_link))) {

total: 0 errors, 2 warnings, 0 checks, 183 lines checked 8bf111e86cf9 drm/i915: Introduce a ww transaction helper
-:56: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_ww' - possible side-effects? #56: FILE: drivers/gpu/drm/i915/i915_gem_ww.h:46:
+#define for_i915_gem_ww(_ww, _err, _intr) \
+ for (__i915_gem_ww_init(_ww, _intr); (_ww)->loop; \
+ _err = __i915_gem_ww_fini(_ww, _err))

-:56: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_err' - possible side-effects? #56: FILE: drivers/gpu/drm/i915/i915_gem_ww.h:46:
+#define for_i915_gem_ww(_ww, _err, _intr) \
+ for (__i915_gem_ww_init(_ww, _intr); (_ww)->loop; \
+ _err = __i915_gem_ww_fini(_ww, _err))

total: 0 errors, 0 warnings, 2 checks, 41 lines checked
50f6709e7fff drm/i915/gt: Add an insert_entry for gen8_ppgtt
e63c320c3025 drm/i915/gt: Add a routine to iterate over the pagetables of a GTT 86e3a5a7d285 drm/i915/gt: Export the pinned context constructor and destructor 5fcf6685a775 drm/i915/gt: Pipelined page migration
-:66: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #66:
new file mode 100644

-:880: WARNING:LINE_SPACING: Missing a blank line after declarations #880: FILE: drivers/gpu/drm/i915/gt/selftest_migrate.c:176:
+ struct drm_i915_private *i915 = migrate->context->engine->i915;
+ I915_RND_STATE(prng);

-:909: WARNING:LINE_SPACING: Missing a blank line after declarations #909: FILE: drivers/gpu/drm/i915/gt/selftest_migrate.c:205:
+ struct threaded_migrate *thread;
+ I915_RND_STATE(prng);

-:934: WARNING:MSLEEP: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst #934: FILE: drivers/gpu/drm/i915/gt/selftest_migrate.c:230:
+ msleep(10); /* start all threads before we kthread_stop() */

total: 0 errors, 4 warnings, 0 checks, 933 lines checked b4f5bf5e3091 drm/i915/gt: Pipelined clear
-:353: WARNING:LINE_SPACING: Missing a blank line after declarations #353: FILE: drivers/gpu/drm/i915/gt/selftest_migrate.c:311:
+ struct drm_i915_private *i915 = migrate->context->engine->i915;
+ I915_RND_STATE(prng);

total: 0 errors, 1 warnings, 0 checks, 378 lines checked a6745617acf0 drm/i915/gt: Setup a default migration context on the GT

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#18 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for Prereqs for TTM accelerated migration (rev2)

In reply to Thomas Hellström
== Series Details ==

== Series Details ==

Series: Prereqs for TTM accelerated migration (rev2)
URL : https://patchwork.freedesktop.org/series/91155/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10195 -> Patchwork_20318
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/index.html

New tests
---------

New tests have been introduced between CI_DRM_10195 and Patchwork_20318:

### New IGT tests (1) ###

* igt@i915_selftest@live@migrate:
- Statuses : 2 dmesg-warn(s) 35 pass(s)
- Exec time: [0.54, 7.97] s

Known issues
------------

Here are the changes found in Patchwork_20318 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@execlists:
- fi-bsw-kefka: NOTRUN -> [INCOMPLETE][1] ([i915#2782] / [i915#2940] / [i915#3462])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-bsw-kefka/igt@i915_selftest@[email protected]

* {igt@i915_selftest@live@migrate} (NEW):
- {fi-ehl-2}: NOTRUN -> [DMESG-WARN][2] ([i915#1222])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-ehl-2/igt@i915_selftest@[email protected]
- {fi-jsl-1}: NOTRUN -> [DMESG-WARN][3] ([i915#1222])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-jsl-1/igt@i915_selftest@[email protected]

* igt@kms_chamelium@hdmi-edid-read:
- fi-bsw-kefka: NOTRUN -> [SKIP][4] ([fdo#109271] / [fdo#111827]) +8 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-bsw-kefka/igt@[email protected]

* igt@kms_psr@cursor_plane_move:
- fi-bsw-kefka: NOTRUN -> [SKIP][5] ([fdo#109271]) +13 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-bsw-kefka/igt@kms_psr@cursor_plane_move.html

* igt@runner@aborted:
- fi-bsw-kefka: NOTRUN -> [FAIL][6] ([fdo#109271] / [i915#1436])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s0:
- fi-bsw-kefka: [INCOMPLETE][7] ([i915#2539]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-bsw-kefka/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-bsw-kefka/igt@[email protected]

#### Warnings ####

* igt@i915_selftest@live@execlists:
- fi-icl-u2: [DMESG-FAIL][9] ([i915#3462]) -> [INCOMPLETE][10] ([i915#2782] / [i915#3462])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-icl-u2/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-icl-u2/igt@i915_selftest@[email protected]
- fi-tgl-u2: [INCOMPLETE][11] ([i915#3462]) -> [DMESG-FAIL][12] ([i915#3462])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-tgl-u2/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-tgl-u2/igt@i915_selftest@[email protected]

* igt@runner@aborted:
- fi-skl-6600u: [FAIL][13] ([i915#1436] / [i915#3363]) -> [FAIL][14] ([i915#1436] / [i915#2426] / [i915#3363])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-skl-6600u/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-skl-6600u/igt@[email protected]
- fi-icl-u2: [FAIL][15] ([i915#2426] / [i915#2782] / [i915#3363]) -> [FAIL][16] ([i915#2782] / [i915#3363])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-icl-u2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-icl-u2/igt@[email protected]
- fi-kbl-7500u: [FAIL][17] ([i915#1436] / [i915#3363]) -> [FAIL][18] ([i915#1436] / [i915#2426] / [i915#3363])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-kbl-7500u/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-kbl-7500u/igt@[email protected]
- fi-cml-u2: [FAIL][19] ([i915#3363] / [i915#3462]) -> [FAIL][20] ([i915#2082] / [i915#2426] / [i915#3363] / [i915#3462])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-cml-u2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-cml-u2/igt@[email protected]
- fi-cfl-guc: [FAIL][21] ([i915#3363]) -> [FAIL][22] ([i915#2426] / [i915#3363])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-cfl-guc/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-cfl-guc/igt@[email protected]
- fi-skl-6700k2: [FAIL][23] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][24] ([i915#1436] / [i915#3363])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/fi-skl-6700k2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/fi-skl-6700k2/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1222]: https://gitlab.freedesktop.org/drm/intel/issues/1222
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#2082]: https://gitlab.freedesktop.org/drm/intel/issues/2082
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2539]: https://gitlab.freedesktop.org/drm/intel/issues/2539
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2932]: https://gitlab.freedesktop.org/drm/intel/issues/2932
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#2966]: https://gitlab.freedesktop.org/drm/intel/issues/2966
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462

Participating hosts (46 -> 41)
------------------------------

Missing (5): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-bdw-samus

Build changes
-------------

* Linux: CI_DRM_10195 -> Patchwork_20318

CI-20190529: 20190529
CI_DRM_10195: 70e4d80795934312a3853a4f4f49445ce6db1271 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6103: 3aa79e55e73d4a49a5222e5dfde486b800a29fe7 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20318: a6745617acf0c89f578fcce067c052117a8a42aa @ git://anongit.freedesktop.org/gfx-ci/linux

== Kernel 32bit build ==

Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/Patchwork_20318/build_32bit.log

  CALL    scripts/checksyscalls.sh
  CALL    scripts/atomic/check-atomics.sh
  CHK     include/generated/compile.h

Kernel: arch/x86/boot/bzImage is ready (#1)
MODPOST modules-only.symvers
ERROR: modpost: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:150: recipe for target 'modules-only.symvers' failed make[1]: *** [modules-only.symvers] Error 1
make[1]: *** Deleting file 'modules-only.symvers'
Makefile:1759: recipe for target 'modules' failed
make: *** [modules] Error 2

== Linux commits ==

a6745617acf0 drm/i915/gt: Setup a default migration context on the GT b4f5bf5e3091 drm/i915/gt: Pipelined clear
5fcf6685a775 drm/i915/gt: Pipelined page migration
86e3a5a7d285 drm/i915/gt: Export the pinned context constructor and destructor e63c320c3025 drm/i915/gt: Add a routine to iterate over the pagetables of a GTT 50f6709e7fff drm/i915/gt: Add an insert_entry for gen8_ppgtt 8bf111e86cf9 drm/i915: Introduce a ww transaction helper ae3f71f8fc2d drm/i915: Break out dma_resv ww locking utilities to separate files be1926db749f drm/i915: Reference objects on the ww object list

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#19 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: warning for Prereqs for TTM accelerated migration (rev2)

In reply to Thomas Hellström
== Series Details ==

== Series Details ==

Series: Prereqs for TTM accelerated migration (rev2)
URL : https://patchwork.freedesktop.org/series/91155/
State : warning

== Summary ==

CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
MODPOST modules-only.symvers
ERROR: modpost: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:150: recipe for target 'modules-only.symvers' failed make[1]: *** [modules-only.symvers] Error 1
make[1]: *** Deleting file 'modules-only.symvers'
Makefile:1759: recipe for target 'modules' failed
make: *** [modules] Error 2

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/build_32bit.log
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#20 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for Prereqs for TTM accelerated migration (rev2)

In reply to Thomas Hellström
== Series Details ==

== Series Details ==

Series: Prereqs for TTM accelerated migration (rev2)
URL : https://patchwork.freedesktop.org/series/91155/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10195_full -> Patchwork_20318_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

New tests
---------

New tests have been introduced between CI_DRM_10195_full and Patchwork_20318_full:

### New IGT tests (2) ###

* igt@i915_selftest@live@migrate:
- Statuses : 6 pass(s)
- Exec time: [1.17, 8.65] s

* igt@i915_selftest@perf@migrate:
- Statuses : 6 pass(s)
- Exec time: [0.69, 5.81] s

Known issues
------------

Here are the changes found in Patchwork_20318_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_create@create-clear:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#1888] / [i915#3160])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-glk3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-glk5/igt@[email protected]

* igt@gem_create@create-massive:
- shard-snb: NOTRUN -> [DMESG-WARN][3] ([i915#3002])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-snb7/igt@[email protected]

* igt@gem_ctx_persistence@idempotent:
- shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1099]) +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-snb7/igt@[email protected]

* igt@gem_ctx_ringsize@active@bcs0:
- shard-skl: NOTRUN -> [INCOMPLETE][5] ([i915#3316])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl3/igt@gem_ctx_ringsize@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-apl: NOTRUN -> [FAIL][6] ([i915#2846])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl6/igt@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][7] -> [FAIL][8] ([i915#2842]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl4/igt@gem_exec_fair@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2842])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-glk5/igt@gem_exec_fair@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-glk7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][11] ([i915#2842])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb4/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-kbl: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#2190])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl3/igt@[email protected]

* igt@gem_mmap_gtt@big-copy:
- shard-skl: [PASS][13] -> [FAIL][14] ([i915#307])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl9/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl6/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-apl: NOTRUN -> [WARN][15] ([i915#2658])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl6/igt@[email protected]

* igt@gem_vm_create@destroy-race:
- shard-tglb: [PASS][16] -> [TIMEOUT][17] ([i915#2795])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-tglb7/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-tglb1/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][18] -> [DMESG-WARN][19] ([i915#1436] / [i915#716])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl3/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]

* igt@i915_hangman@engine-error@vecs0:
- shard-kbl: NOTRUN -> [SKIP][20] ([fdo#109271]) +102 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl4/igt@i915_hangman@[email protected]

* igt@i915_pm_dc@dc6-dpms:
- shard-kbl: NOTRUN -> [FAIL][21] ([i915#454])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl1/igt@[email protected]
- shard-skl: NOTRUN -> [FAIL][22] ([i915#454])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]

* igt@i915_selftest@live@execlists:
- shard-apl: NOTRUN -> [DMESG-FAIL][23] ([i915#3462])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl6/igt@i915_selftest@[email protected]

* igt@kms_ccs@pipe-c-crc-primary-rotation-180:
- shard-skl: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111304])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl3/igt@[email protected]

* igt@kms_chamelium@vga-hpd-enable-disable-mode:
- shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271] / [fdo#111827]) +17 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl2/igt@[email protected]

* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-snb: NOTRUN -> [SKIP][26] ([fdo#109271] / [fdo#111827]) +15 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-snb7/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-gamma:
- shard-kbl: NOTRUN -> [SKIP][27] ([fdo#109271] / [fdo#111827]) +6 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl3/igt@[email protected]

* igt@kms_color_chamelium@pipe-invalid-ctm-matrix-sizes:
- shard-skl: NOTRUN -> [SKIP][28] ([fdo#109271] / [fdo#111827]) +5 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl3/igt@[email protected]

* igt@kms_content_protection@atomic:
- shard-apl: NOTRUN -> [TIMEOUT][29] ([i915#1319]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl2/igt@[email protected]

* igt@kms_content_protection@legacy:
- shard-kbl: NOTRUN -> [TIMEOUT][30] ([i915#1319]) +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl4/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][31] -> [FAIL][32] ([i915#2346] / [i915#533])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

* igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
- shard-apl: [PASS][33] -> [DMESG-WARN][34] ([i915#180])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-apl2/igt@kms_flip@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl8/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [PASS][35] -> [DMESG-WARN][36] ([i915#180]) +4 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl3/igt@kms_flip@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl7/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-ts-check@c-edp1:
- shard-skl: [PASS][37] -> [FAIL][38] ([i915#2122]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl2/igt@kms_flip@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-apl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#2672])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl7/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html

* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
- shard-kbl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#2642])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl3/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][41] ([fdo#109271]) +72 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-onoff:
- shard-snb: NOTRUN -> [SKIP][42] ([fdo#109271]) +322 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-snb7/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-wc:
- shard-skl: [PASS][43] -> [FAIL][44] ([i915#49])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl4/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl7/igt@[email protected]

* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][45] -> [FAIL][46] ([i915#1188]) +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl4/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-apl: NOTRUN -> [SKIP][47] ([fdo#109271] / [i915#533]) +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-skl: NOTRUN -> [FAIL][48] ([fdo#108145] / [i915#265]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][49] -> [FAIL][50] ([fdo#108145] / [i915#265]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][51] ([fdo#108145] / [i915#265]) +2 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl6/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-kbl: NOTRUN -> [FAIL][52] ([fdo#108145] / [i915#265]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl4/igt@[email protected]

* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-skl: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#2733])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl3/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-kbl: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#658]) +2 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl1/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][55] ([fdo#109271] / [i915#658]) +6 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl7/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-skl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#658]) +2 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][57] -> [SKIP][58] ([fdo#109642] / [fdo#111068] / [i915#658])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb2/igt@kms_psr2_su@page_flip.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb1/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [PASS][59] -> [SKIP][60] ([fdo#109441])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb5/igt@kms_psr@psr2_primary_mmap_gtt.html

* igt@kms_writeback@writeback-check-output:
- shard-apl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#2437])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl6/igt@[email protected]

* igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame:
- shard-apl: NOTRUN -> [SKIP][62] ([fdo#109271]) +171 similar issues
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl7/igt@[email protected]

* igt@perf@short-reads:
- shard-skl: [PASS][63] -> [FAIL][64] ([i915#51])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl5/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl3/igt@[email protected]

* igt@sysfs_clients@fair-1:
- shard-apl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#2994]) +2 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl2/igt@[email protected]

* igt@sysfs_clients@recycle:
- shard-kbl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#2994])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl4/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-glk: [FAIL][67] ([i915#2842]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-glk3/igt@gem_exec_fair@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-glk5/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: [FAIL][69] ([i915#2842]) -> [PASS][70] +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-tglb1/igt@gem_exec_fair@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-tglb6/igt@gem_exec_fair@[email protected]

* igt@kms_cursor_edge_walk@pipe-c-256x256-left-edge:
- shard-glk: [DMESG-WARN][71] ([i915#118] / [i915#95]) -> [PASS][72] +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-glk2/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-glk1/igt@[email protected]

* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-skl: [FAIL][73] ([i915#533]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl5/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl9/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [FAIL][75] ([i915#2346]) -> [PASS][76] +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl5/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl9/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][77] ([i915#180]) -> [PASS][78] +8 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl4/igt@kms_flip@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl6/igt@kms_flip@[email protected]
- shard-apl: [DMESG-WARN][79] ([i915#180]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-apl2/igt@kms_flip@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl8/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-fb-recreate@b-dp1:
- shard-kbl: [FAIL][81] ([i915#2122]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl6/igt@kms_flip@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl7/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-fb-recreate@b-edp1:
- shard-skl: [FAIL][83] ([i915#2122]) -> [PASS][84] +2 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl3/igt@kms_flip@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl8/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-skl: [FAIL][85] ([i915#49]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-wc.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-wc.html

* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][87] ([fdo#108145] / [i915#265]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl1/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][89] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb3/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb2/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][91] ([fdo#109441]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb4/igt@kms_psr@psr2_cursor_mmap_cpu.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html

* igt@perf@polling-parameterized:
- shard-iclb: [FAIL][93] ([i915#1542]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb3/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb6/igt@[email protected]

#### Warnings ####

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][95] ([i915#658]) -> [SKIP][96] ([i915#588])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb7/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb2/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][97] ([i915#2684]) -> [WARN][98] ([i915#1804] / [i915#2684]) +1 similar issue
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb5/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb7/igt@[email protected]

* igt@i915_selftest@live@execlists:
- shard-iclb: [DMESG-FAIL][99] ([i915#3462]) -> [INCOMPLETE][100] ([i915#2782] / [i915#3462])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb3/igt@i915_selftest@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb1/igt@i915_selftest@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][101] ([i915#2920]) -> [SKIP][102] ([i915#658]) +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb2/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb1/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][103] ([i915#658]) -> [SKIP][104] ([i915#2920]) +2 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-iclb4/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-iclb2/igt@[email protected]

* igt@runner@aborted:
- shard-kbl: ([FAIL][105], [FAIL][106], [FAIL][107], [FAIL][108], [FAIL][109], [FAIL][110], [FAIL][111], [FAIL][112], [FAIL][113]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363]) -> ([FAIL][114], [FAIL][115], [FAIL][116], [FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363] / [i915#602])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl2/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl2/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl1/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl7/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl4/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl4/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl6/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl4/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-kbl7/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl6/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl7/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl7/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl6/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl1/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl2/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-kbl1/igt@[email protected]
- shard-apl: ([FAIL][121], [FAIL][122]) ([i915#180] / [i915#3002] / [i915#3363]) -> ([FAIL][123], [FAIL][124], [FAIL][125]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#3363])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-apl2/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-apl8/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl6/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl8/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-apl1/igt@[email protected]
- shard-skl: ([FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129]) ([i915#1436] / [i915#1814] / [i915#2029] / [i915#2426] / [i915#3002] / [i915#3363]) -> ([FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133]) ([i915#1436] / [i915#3002] / [i915#3363])
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl7/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl4/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl4/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10195/shard-skl3/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl7/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl8/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl5/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/shard-skl1/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111304]: https://bugs.freedesktop.org/show_bug.cgi?id=111304
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2642]: https://gitlab.freedesktop.org/drm/intel/issues/2642
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2733]: https://gitlab.freedesktop.org/drm/intel/issues/2733
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2795]: https://gitlab.freedesktop.org/drm/intel/issues/2795
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#307]: https://gitlab.freedesktop.org/drm/intel/issues/307
[i915#3160]: https://gitlab.freedesktop.org/drm/intel/issues/3160
[i915#3316]: https://gitlab.freedesktop.org/drm/intel/issues/3316
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#51]: https://gitlab.freedesktop.org/drm/intel/issues/51
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* Linux: CI_DRM_10195 -> Patchwork_20318

CI-20190529: 20190529
CI_DRM_10195: 70e4d80795934312a3853a4f4f49445ce6db1271 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6103: 3aa79e55e73d4a49a5222e5dfde486b800a29fe7 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20318: a6745617acf0c89f578fcce067c052117a8a42aa @ git://ano

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20318/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#21 lore raw
In reply to Thomas Hellström
Quoted 7 lines · Thomas Hellström

A couple of patches from Chris which implement pipelined migration and clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas, as well as modified the above patches for ww locking- and lmem support.

Quoted 7 lines

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early review opportunity.

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a
ls CI warning / failure.

Just to check my understanding of the plan: These are the new windowed clear/blt functions which we plan to use everywhere, because less nasty locking implications? And the clear/blt we currently have in upstream will be replaced?

If so would be nice if this patch set includes that replacement work (I think right now all we have is the clear for lmem), including updating of selftests and stuff like that. Just to avoid having two ways to do the same thing in the driver.
-Daniel

Quoted 50 lines

Chris Wilson (6):
drm/i915/gt: Add an insert_entry for gen8_ppgtt drm/i915/gt: Add a routine to iterate over the pagetables of a GTT drm/i915/gt: Export the pinned context constructor and destructor drm/i915/gt: Pipelined page migration
drm/i915/gt: Pipelined clear
drm/i915/gt: Setup a default migration context on the GT

Thomas Hellström (3):
drm/i915: Reference objects on the ww object list drm/i915: Break out dma_resv ww locking utilities to separate files drm/i915: Introduce a ww transaction helper

 drivers/gpu/drm/i915/Makefile                 |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_object.h    |   9 +-
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c          |  68 ++
 drivers/gpu/drm/i915/gt/intel_engine.h        |  12 +
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  27 +-
 drivers/gpu/drm/i915/gt/intel_gpu_commands.h  |   2 +
 drivers/gpu/drm/i915/gt/intel_gt.c            |   4 +
 drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
 drivers/gpu/drm/i915/gt/intel_gtt.h           |   7 +
 drivers/gpu/drm/i915/gt/intel_migrate.c       | 685 ++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_migrate.h       |  65 ++
 drivers/gpu/drm/i915/gt/intel_migrate_types.h |  15 +
 drivers/gpu/drm/i915/gt/intel_renderstate.h   |   1 +
 drivers/gpu/drm/i915/gt/intel_ring.h          |   1 +
 drivers/gpu/drm/i915/gt/selftest_migrate.c    | 671 +++++++++++++++++
 drivers/gpu/drm/i915/i915_gem.c               |  52 --
 drivers/gpu/drm/i915/i915_gem.h               |  12 -
 drivers/gpu/drm/i915/i915_gem_ww.c            |  63 ++
 drivers/gpu/drm/i915/i915_gem_ww.h            |  50 ++
 .../drm/i915/selftests/i915_live_selftests.h  |   1 +
 .../drm/i915/selftests/i915_perf_selftests.h  |   1 +
 21 files changed, 1675 insertions(+), 76 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h
 create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c
 create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c
 create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h
Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#22 lore raw
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Thomas Hellström

A couple of patches from Chris which implement pipelined migration and clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas, as well as modified the above patches for ww locking- and lmem support.

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early review opportunity.

Quoted 8 lines
Quoted 4 lines

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a
ls CI warning / failure.

Just to check my understanding of the plan: These are the new windowed clear/blt functions which we plan to use everywhere, because less nasty locking implications? And the clear/blt we currently have in upstream will be replaced?

Yes. These are for LMEM clearing and migration. It looks to me like the other ones we have in upstream are actually unused except for selftests. We're actually using CPU clearing for now.

Quoted 5 lines

If so would be nice if this patch set includes that replacement work (I think right now all we have is the clear for lmem), including updating of selftests and stuff like that. Just to avoid having two ways to do the same thing in the driver.

OK, I'll have a look at stripping the existing code. If we need it moving forward, we can always re-add.

/Thomas

Quoted 51 lines

-Daniel

Quoted 49 lines

Chris Wilson (6):
drm/i915/gt: Add an insert_entry for gen8_ppgtt drm/i915/gt: Add a routine to iterate over the pagetables of a GTT drm/i915/gt: Export the pinned context constructor and destructor drm/i915/gt: Pipelined page migration
drm/i915/gt: Pipelined clear
drm/i915/gt: Setup a default migration context on the GT

Thomas Hellström (3):
drm/i915: Reference objects on the ww object list drm/i915: Break out dma_resv ww locking utilities to separate files drm/i915: Introduce a ww transaction helper

  drivers/gpu/drm/i915/Makefile                 |   2 +
  drivers/gpu/drm/i915/gem/i915_gem_object.h    |   9 +-
  drivers/gpu/drm/i915/gt/gen8_ppgtt.c          |  68 ++
  drivers/gpu/drm/i915/gt/intel_engine.h        |  12 +
  drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  27 +-
  drivers/gpu/drm/i915/gt/intel_gpu_commands.h  |   2 +
  drivers/gpu/drm/i915/gt/intel_gt.c            |   4 +
  drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 +
  drivers/gpu/drm/i915/gt/intel_gtt.h           |   7 +
  drivers/gpu/drm/i915/gt/intel_migrate.c       | 685 ++++++++++++++++++
  drivers/gpu/drm/i915/gt/intel_migrate.h       |  65 ++
  drivers/gpu/drm/i915/gt/intel_migrate_types.h |  15 +
  drivers/gpu/drm/i915/gt/intel_renderstate.h   |   1 +
  drivers/gpu/drm/i915/gt/intel_ring.h          |   1 +
  drivers/gpu/drm/i915/gt/selftest_migrate.c    | 671 +++++++++++++++++
  drivers/gpu/drm/i915/i915_gem.c               |  52 --
  drivers/gpu/drm/i915/i915_gem.h               |  12 -
  drivers/gpu/drm/i915/i915_gem_ww.c            |  63 ++
  drivers/gpu/drm/i915/i915_gem_ww.h            |  50 ++
  .../drm/i915/selftests/i915_live_selftests.h  |   1 +
  .../drm/i915/selftests/i915_perf_selftests.h  |   1 +
  21 files changed, 1675 insertions(+), 76 deletions(-)

create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h

Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#23 lore raw
Quoted 25 lines · Thomas Hellström
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Thomas Hellström

A couple of patches from Chris which implement pipelined migration and clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas, as well as modified the above patches for ww locking- and lmem support.

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early review opportunity.

Quoted 8 lines
Quoted 4 lines

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a ls   CI warning / failure.

Just to check my understanding of the plan: These are the new windowed clear/blt functions which we plan to use everywhere, because less nasty locking implications? And the clear/blt we currently have in upstream will be replaced?

Yes. These are for LMEM clearing and migration. It looks to me like the other ones we have in upstream are actually unused except for selftests. We're actually using CPU clearing for now.

Quoted 1 line
Quoted 6 lines
Quoted 4 lines

If so would be nice if this patch set includes that replacement work (I think right now all we have is the clear for lmem), including updating of selftests and stuff like that. Just to avoid having two ways to do the same thing in the driver.

OK, I'll have a look at stripping the existing code. If we need it moving forward, we can always re-add.

Some low hanging fruit would be all the client_blt stuff which can for sure be deleted now.

Quoted 55 lines

/Thomas

Quoted 51 lines

-Daniel

Quoted 49 lines

Chris Wilson (6):
   drm/i915/gt: Add an insert_entry for gen8_ppgtt drm/i915/gt: Add a routine to iterate over the pagetables of a GTT drm/i915/gt: Export the pinned context constructor and destructor drm/i915/gt: Pipelined page migration
   drm/i915/gt: Pipelined clear
   drm/i915/gt: Setup a default migration context on the GT

Thomas Hellström (3):
   drm/i915: Reference objects on the ww object list drm/i915: Break out dma_resv ww locking utilities to separate files drm/i915: Introduce a ww transaction helper

  drivers/gpu/drm/i915/Makefile                 |   2 + drivers/gpu/drm/i915/gem/i915_gem_object.h    |   9 +- drivers/gpu/drm/i915/gt/gen8_ppgtt.c          |  68 ++ drivers/gpu/drm/i915/gt/intel_engine.h        |  12 + drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  27 +- drivers/gpu/drm/i915/gt/intel_gpu_commands.h  |   2 + drivers/gpu/drm/i915/gt/intel_gt.c            |   4 + drivers/gpu/drm/i915/gt/intel_gt_types.h      |   3 + drivers/gpu/drm/i915/gt/intel_gtt.h           |   7 + drivers/gpu/drm/i915/gt/intel_migrate.c       | 685 ++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_migrate.h       |  65 ++ drivers/gpu/drm/i915/gt/intel_migrate_types.h |  15 + drivers/gpu/drm/i915/gt/intel_renderstate.h   |   1 + drivers/gpu/drm/i915/gt/intel_ring.h          |   1 + drivers/gpu/drm/i915/gt/selftest_migrate.c    | 671 +++++++++++++++++ drivers/gpu/drm/i915/i915_gem.c               |  52 -- drivers/gpu/drm/i915/i915_gem.h               |  12 - drivers/gpu/drm/i915/i915_gem_ww.c            |  63 ++ drivers/gpu/drm/i915/i915_gem_ww.h            |  50 ++ .../drm/i915/selftests/i915_live_selftests.h  |   1 + .../drm/i915/selftests/i915_perf_selftests.h  |   1 +

  21 files changed, 1675 insertions(+), 76 deletions(-)

  create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.c create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate.h create mode 100644 drivers/gpu/drm/i915/gt/intel_migrate_types.h create mode 100644 drivers/gpu/drm/i915/gt/selftest_migrate.c create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.c create mode 100644 drivers/gpu/drm/i915/i915_gem_ww.h

Signature · 6 lines
2.31.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#24 lore raw
Quoted 26 lines · Matthew Auld
Quoted 25 lines · Thomas Hellström
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Thomas Hellström

A couple of patches from Chris which implement pipelined migration and clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas, as well as modified the above patches for ww locking- and lmem support.

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early review opportunity.

Quoted 8 lines
Quoted 4 lines

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a ls   CI warning / failure.

Just to check my understanding of the plan: These are the new windowed clear/blt functions which we plan to use everywhere, because less nasty locking implications? And the clear/blt we currently have in upstream will be replaced?

Yes. These are for LMEM clearing and migration. It looks to me like the other ones we have in upstream are actually unused except for selftests. We're actually using CPU clearing for now.

Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

If so would be nice if this patch set includes that replacement work (I think right now all we have is the clear for lmem), including updating of selftests and stuff like that. Just to avoid having two ways to do the same thing in the driver.

OK, I'll have a look at stripping the existing code. If we need it moving forward, we can always re-add.

Some low hanging fruit would be all the client_blt stuff which can for sure be deleted now.

What has the client_blt stuff been used for?

In any case, I need 25 commits for commit access to be granted.

/Thomas

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#25 lore raw
Quoted 35 lines · Thomas Hellström
Quoted 33 lines · Matthew Auld
Quoted 31 lines · Thomas Hellström
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Thomas Hellström

A couple of patches from Chris which implement pipelined migration and clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas, as well as modified the above patches for ww locking- and lmem support.

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early review opportunity.

Quoted 8 lines
Quoted 4 lines

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a ls   CI warning / failure.

Just to check my understanding of the plan: These are the new windowed clear/blt functions which we plan to use everywhere, because less nasty locking implications? And the clear/blt we currently have in upstream will be replaced?

Yes. These are for LMEM clearing and migration. It looks to me like the other ones we have in upstream are actually unused except for selftests. We're actually using CPU clearing for now.

Quoted 5 lines

If so would be nice if this patch set includes that replacement work (I think right now all we have is the clear for lmem), including updating of selftests and stuff like that. Just to avoid having two ways to do the same thing in the driver.

OK, I'll have a look at stripping the existing code. If we need it moving forward, we can always re-add.

Quoted 9 lines
Quoted 1 line

Some low hanging fruit would be all the client_blt stuff which can for sure be deleted now.

What has the client_blt stuff been used for?

In any case, I need 25 commits for commit access to be granted.

/Thomas

Series on trybot now. It's the dg1 live memory_region selftest that changes sligthly to use the new migration fill blt.

/Thomas

#26 lore raw
Quoted 53 lines · Thomas Hellström
Quoted 51 lines · Thomas Hellström
Quoted 41 lines · Matthew Auld
Quoted 40 lines · Thomas Hellström
Quoted 19 lines · Daniel Vetter
Quoted 10 lines · Thomas Hellström

A couple of patches from Chris which implement pipelined migration and
clears by atomically writing the PTEs in place before performing the actual blit.

Some ww utilities mainly for the accompanying selftests added by Thomas,
as well as modified the above patches for ww locking- and lmem support.

Quoted 8 lines

The actual hook up to the i915 ttm backend is being worked on and not included yet, so this is considered to be an early
review opportunity.

v2:
- A couple of minor style fixes pointed out by Matthew Auld
- Export and use intel_engine_destroy_pinned_context() to address a ls   CI warning / failure.

Quoted 6 lines

Just to check my understanding of the plan: These are the new windowed clear/blt functions which we plan to use everywhere, because less nasty
locking implications? And the clear/blt we currently have in upstream will
be replaced?

Yes. These are for LMEM clearing and migration. It looks to me like the other ones we have in upstream are actually unused except for selftests. We're actually using CPU clearing for now.

Quoted 7 lines

If so would be nice if this patch set includes that replacement work (I
think right now all we have is the clear for lmem), including updating of
selftests and stuff like that. Just to avoid having two ways to do the same thing in the driver.

Quoted 5 lines
Quoted 2 lines

OK, I'll have a look at stripping the existing code. If we need it moving forward, we can always re-add.

Some low hanging fruit would be all the client_blt stuff which can for sure be deleted now.

What has the client_blt stuff been used for?

Quoted 7 lines
Quoted 5 lines

In any case, I need 25 commits for commit access to be granted.

/Thomas

Series on trybot now. It's the dg1 live memory_region selftest that changes sligthly to use the new migration fill blt.

Thanks a lot for taking care of this!
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch