Skip to contentSkip to conversation

i915 TTM sync accelerated migration and clear

PATCH In review Thomas Hellström 3 participants 18 messages Jun 17, 2021 – Aug 5, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v5 cover i915 TTM sync accelerated migration and clear

This patchset implements synchronous accelerated migration and clearing for i915 on TTM. We plan to follow up with these operations made asynchronous to the extent of TTM support for that:

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.

Hooked up to our TTM backend by Ramalingam

Finally, on request from Daniel, we ditch old blit code which is now obsolete.

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.
v3:
- Acceleration hooked up to TTM
- Minor fixes to review comments (Pointed out by Matthew Auld)
- Fix pipelined blit handling of engine instances (Pointed out by Matthew Auld)
- Ditch old blit code, (Pointed out by Daniel)
v4:
- Rescue a selftest that was removed with the old blit code (Pointed out by Matthew Auld)
- Extended gpu waits in the TTM accel move function
(Pointed out by Thomas Hellström)
v5:
- Minor rebase on buddy series.
- Added R-Bs for the last patches.

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

Ramalingam C (1):
drm/i915/ttm: accelerated move implementation

Thomas Hellström (5):
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 drm/i915/gem: Zap the client blt code
drm/i915/gem: Zap the i915_gem_object_blt code

 drivers/gpu/drm/i915/Makefile                 |   5 +-
 .../gpu/drm/i915/gem/i915_gem_client_blt.c    | 355 ---------
 .../gpu/drm/i915/gem/i915_gem_client_blt.h    |  21 -
 drivers/gpu/drm/i915/gem/i915_gem_object.h    |   9 +-
 .../gpu/drm/i915/gem/i915_gem_object_blt.c    | 461 ------------
 .../gpu/drm/i915/gem/i915_gem_object_blt.h    |  39 -
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c       |  88 ++-
 .../i915/gem/selftests/i915_gem_client_blt.c  | 114 +--
 .../i915/gem/selftests/i915_gem_object_blt.c  | 597 ---------------
 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       | 687 ++++++++++++++++++
 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    | 669 +++++++++++++++++
 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  |   2 +-
 .../drm/i915/selftests/i915_perf_selftests.h  |   2 +-
 .../drm/i915/selftests/intel_memory_region.c  |  21 +-
 29 files changed, 1766 insertions(+), 1686 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.h
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h
 delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
 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 v5 1/12 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 d66aa00d023a..241666931945 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 6a0a3f0e36e1..c62dcd0e341a 100644
@@ -1222,6 +1222,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);
 	}
 }
 
@@ -1229,6 +1230,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)
@@ -1253,6 +1255,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
#4 lore raw

PATCH v5 3/12 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 · 6 lines
2.31.1

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

PATCH v5 4/12 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
#3 lore raw

PATCH v5 2/12 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 6c84e96ab26a..dde698f3bff4 100644
@@ -166,6 +166,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 241666931945..7bf4dd46d8d2 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 · 6 lines
2.31.1

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

PATCH v5 7/12 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).
v3:
- Remove an obsolete GEM_BUG_ON (Pointed out by Matthew Auld)
- Fix the size argument in allocate_va_range() to not include the base (Pointed out by Matthew Auld)

---
 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       | 542 ++++++++++++++++++
 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, 899 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 dde698f3bff4..5e10e0628c56 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 +542 -0

542 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
#6 lore raw

PATCH v5 5/12 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
#10 lore raw

PATCH v5 8/12 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.

---
v3:
- Handle engine instances correctly (Reported by Matthew Auld)

---
 drivers/gpu/drm/i915/gt/intel_migrate.c    | 143 ++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_migrate.h    |  20 +++
 drivers/gpu/drm/i915/gt/selftest_migrate.c | 163 +++++++++++++++++++++
 3 files changed, 326 insertions(+)
drivers/gpu/drm/i915/gt/intel_migrate.c +143 -0
index e2e860063e7b..ba4009120b33 100644
@@ -488,6 +488,114 @@ 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 instance = rq->engine->instance;
+	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++ = instance;
+		*cs++ = value;
+		*cs++ = MI_NOOP;
+	} else {
+		GEM_BUG_ON(instance);
+		*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,
@@ -526,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 · 1 line
2.31.1
#12 lore raw

PATCH v5 10/12 drm/i915/ttm: accelerated move implementation

In reply to Thomas Hellström

From: Ramalingam C <[email protected]>

Invokes the pipelined page migration through blt, for i915_ttm_move requests of eviction and also obj clear.

---
v2:
- subfunction for accel_move (Thomas)
- engine_pm_get/put around context_move/clear (Thomas)
- Invalidation at accel_clear (Thomas)
v3:
- conflict resolution s/&bo->mem/bo->resource/g
v4:
- Timeout is set for MAX_SCHEDULE_TIMEOUT (Thomas)
- s/TTM_PL_PRIV/I915_PL_LMEM0 (Thomas)

---
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 88 +++++++++++++++++++++----
 1 file changed, 75 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +75 -13
index 9366b18d1bc6..df46535cca47 100644
@@ -15,6 +15,9 @@
 #include "gem/i915_gem_ttm.h"
 #include "gem/i915_gem_mman.h"
 
+#include "gt/intel_migrate.h"
+#include "gt/intel_engine_pm.h"
+
 #define I915_PL_LMEM0 TTM_PL_PRIV
 #define I915_PL_SYSTEM TTM_PL_SYSTEM
 #define I915_PL_STOLEN TTM_PL_VRAM
@@ -326,6 +329,62 @@ i915_ttm_resource_get_st(struct drm_i915_gem_object *obj,
 	return intel_region_ttm_resource_to_st(obj->mm.region, res);
 }
 
+static int i915_ttm_accel_move(struct ttm_buffer_object *bo,
+			       struct ttm_resource *dst_mem,
+			       struct sg_table *dst_st)
+{
+	struct drm_i915_private *i915 = container_of(bo->bdev, typeof(*i915),
+						     bdev);
+	struct ttm_resource_manager *src_man =
+		ttm_manager_type(bo->bdev, bo->resource->mem_type);
+	struct drm_i915_gem_object *obj = i915_ttm_to_gem(bo);
+	struct sg_table *src_st;
+	struct i915_request *rq;
+	int ret;
+
+	if (!i915->gt.migrate.context)
+		return -EINVAL;
+
+	if (!bo->ttm || !ttm_tt_is_populated(bo->ttm)) {
+		if (bo->type == ttm_bo_type_kernel)
+			return -EINVAL;
+
+		if (bo->ttm &&
+		    !(bo->ttm->page_flags & TTM_PAGE_FLAG_ZERO_ALLOC))
+			return 0;
+
+		intel_engine_pm_get(i915->gt.migrate.context->engine);
+		ret = intel_context_migrate_clear(i915->gt.migrate.context, NULL,
+						  dst_st->sgl, I915_CACHE_NONE,
+						  dst_mem->mem_type >= I915_PL_LMEM0,
+						  0, &rq);
+
+		if (!ret && rq) {
+			i915_request_wait(rq, 0, MAX_SCHEDULE_TIMEOUT);
+			i915_request_put(rq);
+		}
+		intel_engine_pm_put(i915->gt.migrate.context->engine);
+	} else {
+		src_st = src_man->use_tt ? i915_ttm_tt_get_st(bo->ttm) :
+						obj->ttm.cached_io_st;
+
+		intel_engine_pm_get(i915->gt.migrate.context->engine);
+		ret = intel_context_migrate_copy(i915->gt.migrate.context,
+						 NULL, src_st->sgl, I915_CACHE_NONE,
+						 bo->resource->mem_type >= I915_PL_LMEM0,
+						 dst_st->sgl, I915_CACHE_NONE,
+						 dst_mem->mem_type >= I915_PL_LMEM0,
+						 &rq);
+		if (!ret && rq) {
+			i915_request_wait(rq, 0, MAX_SCHEDULE_TIMEOUT);
+			i915_request_put(rq);
+		}
+		intel_engine_pm_put(i915->gt.migrate.context->engine);
+	}
+
+	return ret;
+}
+
 static int i915_ttm_move(struct ttm_buffer_object *bo, bool evict,
 			 struct ttm_operation_ctx *ctx,
 			 struct ttm_resource *dst_mem,
@@ -376,19 +435,22 @@ static int i915_ttm_move(struct ttm_buffer_object *bo, bool evict,
 	if (IS_ERR(dst_st))
 		return PTR_ERR(dst_st);
 
-	/* If we start mapping GGTT, we can no longer use man::use_tt here. */
-	dst_iter = dst_man->use_tt ?
-		ttm_kmap_iter_tt_init(&_dst_iter.tt, bo->ttm) :
-		ttm_kmap_iter_iomap_init(&_dst_iter.io, &dst_reg->iomap,
-					 dst_st, dst_reg->region.start);
-
-	src_iter = src_man->use_tt ?
-		ttm_kmap_iter_tt_init(&_src_iter.tt, bo->ttm) :
-		ttm_kmap_iter_iomap_init(&_src_iter.io, &src_reg->iomap,
-					 obj->ttm.cached_io_st,
-					 src_reg->region.start);
-
-	ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter);
+	ret = i915_ttm_accel_move(bo, dst_mem, dst_st);
+	if (ret) {
+		/* If we start mapping GGTT, we can no longer use man::use_tt here. */
+		dst_iter = dst_man->use_tt ?
+			ttm_kmap_iter_tt_init(&_dst_iter.tt, bo->ttm) :
+			ttm_kmap_iter_iomap_init(&_dst_iter.io, &dst_reg->iomap,
+						 dst_st, dst_reg->region.start);
+
+		src_iter = src_man->use_tt ?
+			ttm_kmap_iter_tt_init(&_src_iter.tt, bo->ttm) :
+			ttm_kmap_iter_iomap_init(&_src_iter.io, &src_reg->iomap,
+						 obj->ttm.cached_io_st,
+						 src_reg->region.start);
+
+		ttm_move_memcpy(bo, dst_mem->num_pages, dst_iter, src_iter);
+	}
 	ttm_bo_move_sync_cleanup(bo, dst_mem);
 	i915_ttm_free_cached_io_st(obj);
 
Signature · 6 lines
2.31.1

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

PATCH v5 9/12 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.

---
v3:
- Skip checks for lmem presence before creating objects (Reported by Matthew Auld)

---
 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       |   2 +
 drivers/gpu/drm/i915/gt/selftest_migrate.c    | 237 +++++++++++++++++-
 .../drm/i915/selftests/i915_perf_selftests.h  |   1 +
 5 files changed, 236 insertions(+), 11 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 -0
index ba4009120b33..23c59ce66cee 100644
@@ -418,6 +418,7 @@ 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->ring->size < SZ_64K);
@@ -536,6 +537,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 +226 -11

259 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 · 6 lines
2.31.1

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

PATCH v5 6/12 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
#13 lore raw

PATCH v5 11/12 drm/i915/gem: Zap the client blt code

In reply to Thomas Hellström

It's not used anywhere.

---
v4:
- Add back the igt_client_tiled_blits selftest (Suggested by Matthew Auld)

---
 drivers/gpu/drm/i915/Makefile                 |   2 +-
 .../gpu/drm/i915/gem/i915_gem_client_blt.c    | 355 ------------------
 .../gpu/drm/i915/gem/i915_gem_client_blt.h    |  21 --
 .../i915/gem/selftests/i915_gem_client_blt.c  | 114 +-----
 4 files changed, 2 insertions(+), 490 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.c
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_client_blt.h
drivers/gpu/drm/i915/Makefile +1 -1
index 5e10e0628c56..ffa14084432c 100644
@@ -136,7 +136,6 @@ i915-y += $(gt-y)
 gem-y += \
 	gem/i915_gem_busy.o \
 	gem/i915_gem_clflush.o \
-	gem/i915_gem_client_blt.o \
 	gem/i915_gem_context.o \
 	gem/i915_gem_create.o \
 	gem/i915_gem_dmabuf.o \
@@ -281,6 +280,7 @@ i915-y += i915_perf.o
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
 i915-$(CONFIG_DRM_I915_SELFTEST) += \
+	gem/selftests/i915_gem_client_blt.o \
 	gem/selftests/igt_gem_utils.o \
 	selftests/i915_random.o \
 	selftests/i915_selftest.o \
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c deleted +0 -355

355 lines not on this page · raw message

drivers/gpu/drm/i915/gem/i915_gem_client_blt.h deleted +0 -21
deleted file mode 100644
index 3dbd28c22ff5..000000000000
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2019 Intel Corporation
- */
-#ifndef __I915_GEM_CLIENT_BLT_H__
-#define __I915_GEM_CLIENT_BLT_H__
-
-#include <linux/types.h>
-
-struct drm_i915_gem_object;
-struct i915_page_sizes;
-struct intel_context;
-struct sg_table;
-
-int i915_gem_schedule_fill_pages_blt(struct drm_i915_gem_object *obj,
-				     struct intel_context *ce,
-				     struct sg_table *pages,
-				     struct i915_page_sizes *page_sizes,
-				     u32 value);
-
-#endif
drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +1 -113

132 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

PATCH v5 12/12 drm/i915/gem: Zap the i915_gem_object_blt code

In reply to Thomas Hellström

It's unused with the exception of selftest. Replace a call in the memory_region live selftest with a call into a corresponding function in the new migrate code.

---
 drivers/gpu/drm/i915/Makefile                 |   1 -
 .../gpu/drm/i915/gem/i915_gem_object_blt.c    | 461 --------------
 .../gpu/drm/i915/gem/i915_gem_object_blt.h    |  39 --
 .../i915/gem/selftests/i915_gem_object_blt.c  | 597 ------------------
 .../drm/i915/selftests/i915_live_selftests.h  |   1 -
 .../drm/i915/selftests/i915_perf_selftests.h  |   1 -
 .../drm/i915/selftests/intel_memory_region.c  |  21 +-
 7 files changed, 14 insertions(+), 1107 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.c
 delete mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_blt.h
 delete mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
drivers/gpu/drm/i915/Makefile +0 -1
index ffa14084432c..01f28ad5ea57 100644
@@ -143,7 +143,6 @@ gem-y += \
 	gem/i915_gem_execbuffer.o \
 	gem/i915_gem_internal.o \
 	gem/i915_gem_object.o \
-	gem/i915_gem_object_blt.o \
 	gem/i915_gem_lmem.o \
 	gem/i915_gem_mman.o \
 	gem/i915_gem_pages.o \
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c deleted +0 -461

461 lines not on this page · raw message

drivers/gpu/drm/i915/gem/i915_gem_object_blt.h deleted +0 -39
deleted file mode 100644
index 2409fdcccf0e..000000000000
@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2019 Intel Corporation
- */
-
-#ifndef __I915_GEM_OBJECT_BLT_H__
-#define __I915_GEM_OBJECT_BLT_H__
-
-#include <linux/types.h>
-
-#include "gt/intel_context.h"
-#include "gt/intel_engine_pm.h"
-#include "i915_vma.h"
-
-struct drm_i915_gem_object;
-struct i915_gem_ww_ctx;
-
-struct i915_vma *intel_emit_vma_fill_blt(struct intel_context *ce,
-					 struct i915_vma *vma,
-					 struct i915_gem_ww_ctx *ww,
-					 u32 value);
-
-struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce,
-					 struct i915_gem_ww_ctx *ww,
-					 struct i915_vma *src,
-					 struct i915_vma *dst);
-
-int intel_emit_vma_mark_active(struct i915_vma *vma, struct i915_request *rq);
-void intel_emit_vma_release(struct intel_context *ce, struct i915_vma *vma);
-
-int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj,
-			     struct intel_context *ce,
-			     u32 value);
-
-int i915_gem_object_copy_blt(struct drm_i915_gem_object *src,
-			     struct drm_i915_gem_object *dst,
-			     struct intel_context *ce);
-
-#endif
drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c deleted +0 -597

597 lines not on this page · raw message

drivers/gpu/drm/i915/selftests/i915_live_selftests.h +0 -1
index be5e0191eaea..a68197cf1044 100644
@@ -39,7 +39,6 @@ selftest(evict, i915_gem_evict_live_selftests)
 selftest(hugepages, i915_gem_huge_page_live_selftests)
 selftest(gem_contexts, i915_gem_context_live_selftests)
 selftest(gem_execbuf, i915_gem_execbuffer_live_selftests)
-selftest(blt, i915_gem_object_blt_live_selftests)
 selftest(client, i915_gem_client_blt_live_selftests)
 selftest(reset, intel_reset_live_selftests)
 selftest(memory_region, intel_memory_region_live_selftests)
drivers/gpu/drm/i915/selftests/i915_perf_selftests.h +0 -1
index 5077dc3c3b8c..058450d351f7 100644
@@ -18,5 +18,4 @@
 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)
drivers/gpu/drm/i915/selftests/intel_memory_region.c +14 -7
index 118a66c29695..ecc3b9e6c22b 100644
@@ -15,12 +15,13 @@
 #include "gem/i915_gem_context.h"
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_region.h"
-#include "gem/i915_gem_object_blt.h"
 #include "gem/selftests/igt_gem_utils.h"
 #include "gem/selftests/mock_context.h"
+#include "gt/intel_engine_pm.h"
 #include "gt/intel_engine_user.h"
 #include "gt/intel_gt.h"
 #include "i915_buddy.h"
+#include "gt/intel_migrate.h"
 #include "i915_memcpy.h"
 #include "i915_ttm_buddy_manager.h"
 #include "selftests/igt_flush_test.h"
@@ -808,6 +809,7 @@ static int igt_lmem_write_cpu(void *arg)
 		PAGE_SIZE - 64,
 	};
 	struct intel_engine_cs *engine;
+	struct i915_request *rq;
 	u32 *vaddr;
 	u32 sz;
 	u32 i;
@@ -834,15 +836,20 @@ static int igt_lmem_write_cpu(void *arg)
 		goto out_put;
 	}
 
+	i915_gem_object_lock(obj, NULL);
 	/* Put the pages into a known state -- from the gpu for added fun */
 	intel_engine_pm_get(engine);
-	err = i915_gem_object_fill_blt(obj, engine->kernel_context, 0xdeadbeaf);
-	intel_engine_pm_put(engine);
-	if (err)
-		goto out_unpin;
+	err = intel_context_migrate_clear(engine->gt->migrate.context, NULL,
+					  obj->mm.pages->sgl, I915_CACHE_NONE,
+					  true, 0xdeadbeaf, &rq);
+	if (rq) {
+		dma_resv_add_excl_fence(obj->base.resv, &rq->fence);
+		i915_request_put(rq);
+	}
 
-	i915_gem_object_lock(obj, NULL);
-	err = i915_gem_object_set_to_wc_domain(obj, true);
+	intel_engine_pm_put(engine);
+	if (!err)
+		err = i915_gem_object_set_to_wc_domain(obj, true);
 	i915_gem_object_unlock(obj);
 	if (err)
 		goto out_unpin;
Signature · 1 line
2.31.1
#15 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for i915 TTM sync accelerated migration and clear (rev4)

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

== Series Details ==

Series: i915 TTM sync accelerated migration and clear (rev4)
URL : https://patchwork.freedesktop.org/series/91463/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
05e61818c510 drm/i915: Reference objects on the ww object list
b3d1124db2b3 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 3d2c4703e490 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
55d91f54ea63 drm/i915/gt: Add an insert_entry for gen8_ppgtt
63732fd3b3dd drm/i915/gt: Add a routine to iterate over the pagetables of a GTT dafe4c39f77d drm/i915/gt: Export the pinned context constructor and destructor 1348ed66563c drm/i915/gt: Pipelined page migration
-:67: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #67:
new file mode 100644

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

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

-:933: WARNING:MSLEEP: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.rst #933: 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, 931 lines checked 50c44cdbf0dc drm/i915/gt: Pipelined clear
-:356: WARNING:LINE_SPACING: Missing a blank line after declarations #356: 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, 380 lines checked
af79c48203b1 drm/i915/gt: Setup a default migration context on the GT 44bc96f6062f drm/i915/ttm: accelerated move implementation
f96ba67920e0 drm/i915/gem: Zap the client blt code
-:35: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #35:
deleted file mode 100644

total: 0 errors, 1 warnings, 0 checks, 146 lines checked
0c1b355b98b0 drm/i915/gem: Zap the i915_gem_object_blt code
-:29: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #29:
deleted file mode 100644

total: 0 errors, 1 warnings, 0 checks, 66 lines checked

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

#16 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for i915 TTM sync accelerated migration and clear (rev4)

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

== Series Details ==

Series: i915 TTM sync accelerated migration and clear (rev4)
URL : https://patchwork.freedesktop.org/series/91463/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10233 -> Patchwork_20397
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

New tests
---------

New tests have been introduced between CI_DRM_10233 and Patchwork_20397:

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

* igt@i915_selftest@live@migrate:
- Statuses : 2 dmesg-warn(s) 32 pass(s)
- Exec time: [0.53, 9.0] s

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

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

### IGT changes ###

#### Issues hit ####

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

#### Possible fixes ####

* igt@i915_pm_rpm@module-reload:
- {fi-tgl-dsi}: [DMESG-WARN][3] ([i915#1982] / [i915#2411]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/fi-tgl-dsi/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/fi-tgl-dsi/igt@[email protected]

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

[i915#1222]: https://gitlab.freedesktop.org/drm/intel/issues/1222
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411

Participating hosts (43 -> 38)
------------------------------

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

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

* Linux: CI_DRM_10233 -> Patchwork_20397

CI-20190529: 20190529
CI_DRM_10233: e00d16681acd7e91fd02f800adcc20cca89f6127 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6109: 61ba2ed489540e6a8a649be38abb075b3ab4d28a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20397: 0c1b355b98b0c758f219b94ae5ffcbda0a6acf75 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

0c1b355b98b0 drm/i915/gem: Zap the i915_gem_object_blt code f96ba67920e0 drm/i915/gem: Zap the client blt code
44bc96f6062f drm/i915/ttm: accelerated move implementation af79c48203b1 drm/i915/gt: Setup a default migration context on the GT 50c44cdbf0dc drm/i915/gt: Pipelined clear
1348ed66563c drm/i915/gt: Pipelined page migration
dafe4c39f77d drm/i915/gt: Export the pinned context constructor and destructor 63732fd3b3dd drm/i915/gt: Add a routine to iterate over the pagetables of a GTT 55d91f54ea63 drm/i915/gt: Add an insert_entry for gen8_ppgtt 3d2c4703e490 drm/i915: Introduce a ww transaction helper b3d1124db2b3 drm/i915: Break out dma_resv ww locking utilities to separate files 05e61818c510 drm/i915: Reference objects on the ww object list

== Logs ==

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

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

#17 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for i915 TTM sync accelerated migration and clear (rev4)

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

== Series Details ==

Series: i915 TTM sync accelerated migration and clear (rev4)
URL : https://patchwork.freedesktop.org/series/91463/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10233_full -> Patchwork_20397_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

New tests
---------

New tests have been introduced between CI_DRM_10233_full and Patchwork_20397_full:

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

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

* igt@i915_selftest@perf@migrate:
- Statuses : 5 pass(s)
- Exec time: [1.31, 6.13] s

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

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

### IGT changes ###

#### Issues hit ####

* igt@drm_mm@all@insert_range:
- shard-skl: NOTRUN -> [INCOMPLETE][1] ([i915#2485])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl4/igt@drm_mm@all@insert_range.html

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

* igt@gem_ctx_persistence@legacy-engines-cleanup:
- shard-snb: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#1099]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-snb5/igt@[email protected]

* igt@gem_ctx_shared@detached-shared-gtt:
- shard-glk: [PASS][4] -> [DMESG-WARN][5] ([i915#118] / [i915#95])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-glk3/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk4/igt@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-iclb: [PASS][6] -> [TIMEOUT][7] ([i915#2369] / [i915#2481] / [i915#3070])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb8/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb1/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-glk: [PASS][8] -> [FAIL][9] ([i915#2846])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-glk3/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk4/igt@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [PASS][10] -> [FAIL][11] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb7/igt@gem_exec_fair@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb3/igt@gem_exec_fair@[email protected]
- shard-tglb: [PASS][12] -> [FAIL][13] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-tglb2/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-tglb7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: NOTRUN -> [FAIL][14] ([i915#2842]) +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][15] ([i915#2842]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_reloc@basic-wide-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][16] ([i915#2389]) +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-snb5/igt@gem_exec_reloc@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-kbl: NOTRUN -> [WARN][17] ([i915#2658]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl4/igt@[email protected]

* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][18] ([i915#3002])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl1/igt@[email protected]

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

* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#1937])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl3/igt@i915_pm_lpsp@[email protected]

* igt@i915_selftest@mock@requests:
- shard-skl: [PASS][21] -> [INCOMPLETE][22] ([i915#198])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl2/igt@i915_selftest@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl1/igt@i915_selftest@[email protected]

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

* igt@kms_color_chamelium@pipe-a-ctm-max:
- shard-glk: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk1/igt@[email protected]

* igt@kms_color_chamelium@pipe-a-degamma:
- shard-kbl: NOTRUN -> [SKIP][25] ([fdo#109271] / [fdo#111827]) +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl6/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-ctm-0-25:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271] / [fdo#111827]) +5 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl2/igt@[email protected]

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

* igt@kms_color_chamelium@pipe-d-degamma:
- shard-skl: NOTRUN -> [SKIP][28] ([fdo#109271] / [fdo#111827]) +10 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl6/igt@[email protected]

* igt@kms_content_protection@legacy:
- shard-glk: NOTRUN -> [SKIP][29] ([fdo#109271]) +18 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk1/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-32x32-onscreen:
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271]) +110 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl7/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][31] -> [DMESG-WARN][32] ([i915#180]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl6/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl7/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-c-64x64-bottom-edge:
- shard-skl: [PASS][33] -> [DMESG-WARN][34] ([i915#1982])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl6/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [PASS][35] -> [FAIL][36] ([i915#79]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl4/igt@kms_flip@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl9/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: NOTRUN -> [DMESG-WARN][37] ([i915#180]) +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl3/igt@kms_flip@[email protected]

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

* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-blt:
- shard-snb: NOTRUN -> [SKIP][39] ([fdo#109271]) +246 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-snb6/igt@[email protected]

* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#533])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl4/igt@[email protected]

* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-skl: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#533]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl6/igt@[email protected]

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

* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][43] ([fdo#108145] / [i915#265])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl2/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][44] ([i915#265])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl7/igt@[email protected]

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

* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-skl: NOTRUN -> [SKIP][46] ([fdo#109271] / [i915#658]) +1 similar issue
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl6/igt@[email protected]

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

* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][48] -> [SKIP][49] ([fdo#109441])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb2/igt@kms_psr@psr2_dpms.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb7/igt@kms_psr@psr2_dpms.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [PASS][50] -> [DMESG-WARN][51] ([i915#180] / [i915#295])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-apl3/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl3/igt@[email protected]

* igt@kms_vblank@pipe-d-wait-forked-hang:
- shard-apl: NOTRUN -> [SKIP][52] ([fdo#109271]) +97 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl2/igt@[email protected]

* igt@kms_writeback@writeback-invalid-parameters:
- shard-skl: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#2437])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl7/igt@[email protected]

* igt@kms_writeback@writeback-pixel-formats:
- shard-kbl: NOTRUN -> [SKIP][54] ([fdo#109271] / [i915#2437])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl3/igt@[email protected]

* igt@perf@polling-small-buf:
- shard-skl: [PASS][55] -> [FAIL][56] ([i915#1722])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl2/igt@[email protected]

* igt@perf@short-reads:
- shard-skl: [PASS][57] -> [FAIL][58] ([i915#51])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl5/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl8/igt@[email protected]

* igt@perf_pmu@module-unload:
- shard-skl: NOTRUN -> [DMESG-WARN][59] ([i915#1982] / [i915#262])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl7/igt@[email protected]

* igt@sysfs_clients@busy:
- shard-apl: NOTRUN -> [SKIP][60] ([fdo#109271] / [i915#2994]) +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl7/igt@[email protected]

* igt@sysfs_clients@fair-0:
- shard-skl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#2994]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl6/igt@[email protected]

* igt@sysfs_clients@sema-25:
- shard-kbl: NOTRUN -> [SKIP][62] ([fdo#109271] / [i915#2994]) +2 similar issues
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl3/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_isolation@preservation-s3@vecs0:
- shard-skl: [INCOMPLETE][63] ([i915#198]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl8/igt@gem_ctx_isolation@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl3/igt@gem_ctx_isolation@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-tglb: [TIMEOUT][65] ([i915#2369] / [i915#3063]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-tglb1/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-tglb1/igt@[email protected]

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: [FAIL][67] ([i915#2842]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl3/igt@gem_exec_fair@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@bcs0:
- shard-iclb: [FAIL][69] ([i915#2842]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb8/igt@gem_exec_fair@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs1:
- shard-tglb: [FAIL][71] ([i915#2842]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-tglb1/igt@gem_exec_fair@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-tglb1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][73] ([i915#2849]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb6/igt@gem_exec_fair@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_parallel@engines@basic:
- shard-glk: [DMESG-WARN][75] ([i915#118] / [i915#95]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-glk2/igt@gem_exec_parallel@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk5/igt@gem_exec_parallel@[email protected]

* igt@gem_mmap_gtt@big-copy:
- shard-skl: [FAIL][77] ([i915#307]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl1/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl6/igt@[email protected]

* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [FAIL][79] ([i915#307]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb2/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb7/igt@[email protected]

* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][81] ([i915#644]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-glk5/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk6/igt@[email protected]

* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][83] ([i915#1436] / [i915#716]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-glk3/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk1/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][85] ([i915#454]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb8/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb1/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][87] ([i915#79]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-glk9/igt@kms_flip@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-glk1/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-dp1:
- shard-kbl: [FAIL][89] ([i915#79]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl4/igt@kms_flip@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl4/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][91] ([i915#180]) -> [PASS][92] +9 similar issues
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl2/igt@kms_flip@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl3/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-wc:
- shard-tglb: [DMESG-WARN][93] ([i915#2868]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-tglb5/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-tglb5/igt@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][95] ([i915#1188]) -> [PASS][96] +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl6/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl2/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][97] ([fdo#108145] / [i915#265]) -> [PASS][98] +1 similar issue
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-skl8/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-skl10/igt@[email protected]

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [DMESG-WARN][99] ([i915#180] / [i915#295]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl1/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl6/igt@[email protected]

#### Warnings ####

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
- shard-iclb: [SKIP][101] ([i915#2920]) -> [SKIP][102] ([i915#658])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb2/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-iclb7/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-4:
- shard-iclb: [SKIP][103] ([i915#658]) -> [SKIP][104] ([i915#2920])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-iclb1/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/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], [FAIL][114], [FAIL][115], [FAIL][116]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#602] / [i915#92]) -> ([FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120], [FAIL][121], [FAIL][122]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#92])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl1/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl1/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl7/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl2/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl4/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl1/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl1/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl2/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl7/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl7/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl2/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-kbl7/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl3/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl2/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl2/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl7/igt@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl1/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-kbl7/igt@[email protected]
- shard-apl: ([FAIL][123], [FAIL][124]) ([i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132]) ([fdo#109271] / [i915#1610] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363])
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-apl1/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10233/shard-apl3/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl1/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl3/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl1/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl3/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl7/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl1/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl3/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20397/shard-apl7/igt@[email protected]

[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#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#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2481]: https://gitlab.freedesktop.org/drm/intel/issues/2481
[i915#2485]: https://gitlab.freedesktop.org/drm/intel/issues/2485
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[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#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2849]: https://gitlab.freedesktop.org/drm/intel/issues/2849
[i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#307]: https://gitlab.freedesktop.org/drm/intel/issues/307
[i915#3070]: https://gitlab.freedesktop.org/drm/intel/issues/3070
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#51]: https://gitlab.freedesktop.org/drm/intel/issues/51
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

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

No changes in participating hosts

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

* Linux: CI_DRM_10233 -> Patchwork_20397

CI-20190529: 20190529
CI_DRM_10233: e00d16681acd7e91fd02f800adcc20cca89f6127 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6109: 61ba2ed489540e6a8a649be38abb075b3ab4d28a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20397: 0c1b355b98b0c758f219b94ae5ffcbda0a6acf75 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

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

Acked-by on v5 1/12
#2 lore raw

Re: [Intel-gfx] [PATCH v5 01/12] drm/i915: Reference objects on the ww object list

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

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.

Quoted 8 lines

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.

I've looked the past 2-3 weeks in-depth at our execbuf code. That has definitely gone way too far into "very clevery" territory, and safe is so much better than clever.

If there's a fundamental performance issue, we need to fix this in a fundamental way. E.g. for this one here a possible solution could be VM_BIND, at least in the fastpath, where we don't need to look-up any objects, nor refcount them, nor anything else (at least that's the goal). Only some per vm/request book-keeping and done.

Also I think we can easily claw this back once we get to the cleanup part of this work: i915_vma_pin has a bunch of atomics (and lots of locks in slow-paths) of its own, which are largely redundant now that object state is protected by dma_resv_lock. Once that's cleaned up we can pay our atomic inc/dec here with the removed atomic ops from the vma side I think.

Anyway just figured I drop some thoughts and my ack on the direction you're pushing here.
-Daniel

Quoted 65 lines
---
 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 d66aa00d023a..241666931945 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 6a0a3f0e36e1..c62dcd0e341a 100644
@@ -1222,6 +1222,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);
 	}
 }
 
@@ -1229,6 +1230,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)
@@ -1253,6 +1255,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
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

Re: [Intel-gfx] [PATCH v5 07/12] drm/i915/gt: Pipelined page migration

In reply to Thomas Hellström
Quoted 19 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.

Quoted 9 lines

---
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).
v3:
- Remove an obsolete GEM_BUG_ON (Pointed out by Matthew Auld)
- Fix the size argument in allocate_va_range() to not include the base (Pointed out by Matthew Auld)

I stumbled over this because I was chasing some intel_context->vm users, and have a few comments and questions.

First, we generally keep the patch changelog above the cut, it's often fairly useful information when browsing old history.

Quoted 72 lines
---
 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       | 542 ++++++++++++++++++
 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, 899 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 dde698f3bff4..5e10e0628c56 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 +11 -0
new file mode 100644
index 000000000000..e2e860063e7b
@@ -0,0 +1,542 @@
+// 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"

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

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +10 -0
+#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)

This function seems like a rather elobarote way to write a NULL check. Do we really need this?

Quoted 63 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +63 -0
+{
+       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);
+

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

Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +10 -0
+       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++) {

Why are we setting this up for all copy engine, when we run out jobs only on one? Afaiui the arch decision is that the kernel reserves one copy engine for it's private use on chips with multiple, and that's it. So this looks like overkill that we should remove.

Adding Jon Bloomfield, that's his area.

Also, why do we have a separate migrate_vm, and don't just set this up for i915->gt.vm? For small bar we'll need another few special mappings, having distinct vms for these and then always trying to make sure we use the right one feels a bit overcomplicated. This is the reason I stumbled over this, I was working on some patch to make a clearer separation between user hw context (which have their own vm), and the kernel hw context (which should share all the same one, like the core linux kernel has one mm_struct for all kernel threads).

If we can I think simplifying this would be nice, there's a bit of stuff that we can perhaps trim here.

Cheers, Daniel

Quoted 848 lines
drivers/gpu/drm/i915/gt/intel_migrate.c new file +448 -0
+               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
+                * 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);
+
+               err = i915_vm_alloc_pt_stash(&vm->vm, &stash, sz);
+               if (err)
+                       goto err_vm;
+
+               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, sz);
+               }
+               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]);
+               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);
+}
+
+static struct intel_engine_cs *first_copy_engine(struct intel_gt *gt)
+{
+       struct intel_engine_cs *engine;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(gt->engine_class[COPY_ENGINE_CLASS]); i++) {
+               engine = gt->engine_class[COPY_ENGINE_CLASS][i];
+               if (engine_supports_migration(engine))
+                       return engine;
+       }
+
+       return NULL;
+}
+
+static struct intel_context *pinned_context(struct intel_gt *gt)
+{
+       static struct lock_class_key key;
+       struct intel_engine_cs *engine;
+       struct i915_address_space *vm;
+       struct intel_context *ce;
+
+       engine = first_copy_engine(gt);
+       if (!engine)
+               return ERR_PTR(-ENODEV);
+
+       vm = migrate_vm(gt);
+       if (IS_ERR(vm))
+               return ERR_CAST(vm);
+
+       ce = intel_engine_create_pinned_context(engine, vm, SZ_512K,
+                                               I915_GEM_HWS_MIGRATE,
+                                               &key, "migrate");
+       i915_vm_put(ce->vm);
+       return ce;
+}
+
+int intel_migrate_init(struct intel_migrate *m, struct intel_gt *gt)
+{
+       struct intel_context *ce;
+
+       memset(m, 0, sizeof(*m));
+
+       ce = pinned_context(gt);
+       if (IS_ERR(ce))
+               return PTR_ERR(ce);
+
+       m->context = ce;
+       return 0;
+}
+
+static int random_index(unsigned int max)
+{
+       return upper_32_bits(mul_u32_u32(get_random_u32(), max));
+}
+
+static struct intel_context *__migrate_engines(struct intel_gt *gt)
+{
+       struct intel_engine_cs *engines[MAX_ENGINE_INSTANCE];
+       struct intel_engine_cs *engine;
+       unsigned int count, i;
+
+       count = 0;
+       for (i = 0; i < ARRAY_SIZE(gt->engine_class[COPY_ENGINE_CLASS]); i++) {
+               engine = gt->engine_class[COPY_ENGINE_CLASS][i];
+               if (engine_supports_migration(engine))
+                       engines[count++] = engine;
+       }
+
+       return intel_context_create(engines[random_index(count)]);
+}
+
+struct intel_context *intel_migrate_create_context(struct intel_migrate *m)
+{
+       struct intel_context *ce;
+
+       /*
+        * We randomly distribute contexts across the engines upon constrction,
+        * as they all share the same pinned vm, and so in order to allow
+        * multiple blits to run in parallel, we must construct each blit
+        * to use a different range of the vm for its GTT. This has to be
+        * known at construction, so we can not use the late greedy load
+        * balancing of the virtual-engine.
+        */
+       ce = __migrate_engines(m->context->engine->gt);
+       if (IS_ERR(ce))
+               return ce;
+
+       ce->ring = __intel_context_ring_size(SZ_256K);
+
+       i915_vm_put(ce->vm);
+       ce->vm = i915_vm_get(m->context->vm);
+
+       return ce;
+}
+
+static inline struct sgt_dma sg_sgt(struct scatterlist *sg)
+{
+       dma_addr_t addr = sg_dma_address(sg);
+
+       return (struct sgt_dma){ sg, addr, addr + sg_dma_len(sg) };
+}
+
+static int emit_no_arbitration(struct i915_request *rq)
+{
+       u32 *cs;
+
+       cs = intel_ring_begin(rq, 2);
+       if (IS_ERR(cs))
+               return PTR_ERR(cs);
+
+       /* Explicitly disable preemption for this request. */
+       *cs++ = MI_ARB_ON_OFF;
+       *cs++ = MI_NOOP;
+       intel_ring_advance(rq, cs);
+
+       return 0;
+}
+
+static int emit_pte(struct i915_request *rq,
+                   struct sgt_dma *it,
+                   enum i915_cache_level cache_level,
+                   bool is_lmem,
+                   u64 offset,
+                   int length)
+{
+       const u64 encode = rq->context->vm->pte_encode(0, cache_level,
+                                                      is_lmem ? PTE_LM : 0);
+       struct intel_ring *ring = rq->ring;
+       int total = 0;
+       u32 *hdr, *cs;
+       int pkt;
+
+       GEM_BUG_ON(INTEL_GEN(rq->engine->i915) < 8);
+
+       /* Compute the page directory offset for the target address range */
+       offset += (u64)rq->engine->instance << 32;
+       offset >>= 12;
+       offset *= sizeof(u64);
+       offset += 2 * CHUNK_SZ;
+
+       cs = intel_ring_begin(rq, 6);
+       if (IS_ERR(cs))
+               return PTR_ERR(cs);
+
+       /* Pack as many PTE updates as possible into a single MI command */
+       pkt = min_t(int, 0x400, ring->space / sizeof(u32) + 5);
+       pkt = min_t(int, pkt, (ring->size - ring->emit) / sizeof(u32) + 5);
+
+       hdr = cs;
+       *cs++ = MI_STORE_DATA_IMM | REG_BIT(21); /* as qword elements */
+       *cs++ = lower_32_bits(offset);
+       *cs++ = upper_32_bits(offset);
+
+       do {
+               if (cs - hdr >= pkt) {
+                       *hdr += cs - hdr - 2;
+                       *cs++ = MI_NOOP;
+
+                       ring->emit = (void *)cs - ring->vaddr;
+                       intel_ring_advance(rq, cs);
+                       intel_ring_update_space(ring);
+
+                       cs = intel_ring_begin(rq, 6);
+                       if (IS_ERR(cs))
+                               return PTR_ERR(cs);
+
+                       pkt = min_t(int, 0x400, ring->space / sizeof(u32) + 5);
+                       pkt = min_t(int, pkt, (ring->size - ring->emit) / sizeof(u32) + 5);
+
+                       hdr = cs;
+                       *cs++ = MI_STORE_DATA_IMM | REG_BIT(21);
+                       *cs++ = lower_32_bits(offset);
+                       *cs++ = upper_32_bits(offset);
+               }
+
+               *cs++ = lower_32_bits(encode | it->dma);
+               *cs++ = upper_32_bits(encode | it->dma);
+
+               offset += 8;
+               total += I915_GTT_PAGE_SIZE;
+
+               it->dma += I915_GTT_PAGE_SIZE;
+               if (it->dma >= it->max) {
+                       it->sg = __sg_next(it->sg);
+                       if (!it->sg || sg_dma_len(it->sg) == 0)
+                               break;
+
+                       it->dma = sg_dma_address(it->sg);
+                       it->max = it->dma + sg_dma_len(it->sg);
+               }
+       } while (total < length);
+
+       *hdr += cs - hdr - 2;
+       *cs++ = MI_NOOP;
+
+       ring->emit = (void *)cs - ring->vaddr;
+       intel_ring_advance(rq, cs);
+       intel_ring_update_space(ring);
+
+       return total;
+}
+
+static bool wa_1209644611_applies(int gen, u32 size)
+{
+       u32 height = size >> PAGE_SHIFT;
+
+       if (gen != 11)
+               return false;
+
+       return height % 4 == 3 && height <= 8;
+}
+
+static int emit_copy(struct i915_request *rq, int size)
+{
+       const int gen = INTEL_GEN(rq->engine->i915);
+       u32 instance = rq->engine->instance;
+       u32 *cs;
+
+       cs = intel_ring_begin(rq, gen >= 8 ? 10 : 6);
+       if (IS_ERR(cs))
+               return PTR_ERR(cs);
+
+       if (gen >= 9 && !wa_1209644611_applies(gen, size)) {
+               *cs++ = GEN9_XY_FAST_COPY_BLT_CMD | (10 - 2);
+               *cs++ = BLT_DEPTH_32 | PAGE_SIZE;
+               *cs++ = 0;
+               *cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+               *cs++ = CHUNK_SZ; /* dst offset */
+               *cs++ = instance;
+               *cs++ = 0;
+               *cs++ = PAGE_SIZE;
+               *cs++ = 0; /* src offset */
+               *cs++ = instance;
+       } else if (gen >= 8) {
+               *cs++ = XY_SRC_COPY_BLT_CMD | BLT_WRITE_RGBA | (10 - 2);
+               *cs++ = BLT_DEPTH_32 | BLT_ROP_SRC_COPY | PAGE_SIZE;
+               *cs++ = 0;
+               *cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+               *cs++ = CHUNK_SZ; /* dst offset */
+               *cs++ = instance;
+               *cs++ = 0;
+               *cs++ = PAGE_SIZE;
+               *cs++ = 0; /* src offset */
+               *cs++ = instance;
+       } else {
+               GEM_BUG_ON(instance);
+               *cs++ = SRC_COPY_BLT_CMD | BLT_WRITE_RGBA | (6 - 2);
+               *cs++ = BLT_DEPTH_32 | BLT_ROP_SRC_COPY | PAGE_SIZE;
+               *cs++ = size >> PAGE_SHIFT << 16 | PAGE_SIZE;
+               *cs++ = CHUNK_SZ; /* dst offset */
+               *cs++ = PAGE_SIZE;
+               *cs++ = 0; /* src offset */
+       }
+
+       intel_ring_advance(rq, cs);
+       return 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,
+                          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->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;
+}
+
+int intel_migrate_copy(struct intel_migrate *m,
+                      struct i915_gem_ww_ctx *ww,
+                      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,
+                      bool dst_is_lmem,
+                      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_copy(ce, await,
+                                        src, src_cache_level, src_is_lmem,
+                                        dst, dst_cache_level, dst_is_lmem,
+                                        out);
+
+       intel_context_unpin(ce);
+out:
+       intel_context_put(ce);
+       return err;
+}
+
+void intel_migrate_fini(struct intel_migrate *m)
+{
+       struct intel_context *ce;
+
+       ce = fetch_and_zero(&m->context);
+       if (!ce)
+               return;
+
+       intel_engine_destroy_pinned_context(ce);
+}
+
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
+#include "selftest_migrate.c"
+#endif
drivers/gpu/drm/i915/gt/intel_migrate.h new file +45 -0
new file mode 100644
index 000000000000..32c61190ed73
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#ifndef __INTEL_MIGRATE__
+#define __INTEL_MIGRATE__
+
+#include "intel_migrate_types.h"
+
+struct dma_fence;
+struct i915_request;
+struct i915_gem_ww_ctx;
+struct intel_gt;
+struct scatterlist;
+enum i915_cache_level;
+
+int intel_migrate_init(struct intel_migrate *m, struct intel_gt *gt);
+
+struct intel_context *intel_migrate_create_context(struct intel_migrate *m);
+
+int intel_migrate_copy(struct intel_migrate *m,
+                      struct i915_gem_ww_ctx *ww,
+                      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,
+                      bool dst_is_lmem,
+                      struct i915_request **out);
+
+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,
+                              bool dst_is_lmem,
+                              struct i915_request **out);
+
+void intel_migrate_fini(struct intel_migrate *m);
+
+#endif /* __INTEL_MIGRATE__ */
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
new file mode 100644
index 000000000000..9784d149ebf1
@@ -0,0 +1,291 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#include "selftests/i915_random.h"
+
+static const unsigned int sizes[] = {
+       SZ_4K,
+       SZ_64K,
+       SZ_2M,
+       CHUNK_SZ - SZ_4K,
+       CHUNK_SZ,
+       CHUNK_SZ + SZ_4K,
+       SZ_64M,
+};
+
+static struct drm_i915_gem_object *
+create_lmem_or_internal(struct drm_i915_private *i915, size_t size)
+{
+       if (HAS_LMEM(i915)) {
+               struct drm_i915_gem_object *obj;
+
+               obj = i915_gem_object_create_lmem(i915, size, 0);
+               if (!IS_ERR(obj))
+                       return obj;
+       }
+
+       return i915_gem_object_create_internal(i915, size);
+}
+
+static int copy(struct intel_migrate *migrate,
+               int (*fn)(struct intel_migrate *migrate,
+                         struct i915_gem_ww_ctx *ww,
+                         struct drm_i915_gem_object *src,
+                         struct drm_i915_gem_object *dst,
+                         struct i915_request **out),
+               u32 sz, struct rnd_state *prng)
+{
+       struct drm_i915_private *i915 = migrate->context->engine->i915;
+       struct drm_i915_gem_object *src, *dst;
+       struct i915_request *rq;
+       struct i915_gem_ww_ctx ww;
+       u32 *vaddr;
+       int err = 0;
+       int i;
+
+       src = create_lmem_or_internal(i915, sz);
+       if (IS_ERR(src))
+               return 0;
+
+       dst = i915_gem_object_create_internal(i915, sz);
+       if (IS_ERR(dst))
+               goto err_free_src;
+
+       for_i915_gem_ww(&ww, err, true) {
+               err = i915_gem_object_lock(src, &ww);
+               if (err)
+                       continue;
+
+               err = i915_gem_object_lock(dst, &ww);
+               if (err)
+                       continue;
+
+               vaddr = i915_gem_object_pin_map(src, I915_MAP_WC);
+               if (IS_ERR(vaddr)) {
+                       err = PTR_ERR(vaddr);
+                       continue;
+               }
+
+               for (i = 0; i < sz / sizeof(u32); i++)
+                       vaddr[i] = i;
+               i915_gem_object_flush_map(src);
+
+               vaddr = i915_gem_object_pin_map(dst, I915_MAP_WC);
+               if (IS_ERR(vaddr)) {
+                       err = PTR_ERR(vaddr);
+                       goto unpin_src;
+               }
+
+               for (i = 0; i < sz / sizeof(u32); i++)
+                       vaddr[i] = ~i;
+               i915_gem_object_flush_map(dst);
+
+               err = fn(migrate, &ww, src, dst, &rq);
+               if (!err)
+                       continue;
+
+               if (err != -EDEADLK && err != -EINTR && err != -ERESTARTSYS)
+                       pr_err("%ps failed, size: %u\n", fn, sz);
+               if (rq) {
+                       i915_request_wait(rq, 0, HZ);
+                       i915_request_put(rq);
+               }
+               i915_gem_object_unpin_map(dst);
+unpin_src:
+               i915_gem_object_unpin_map(src);
+       }
+       if (err)
+               goto err_out;
+
+       if (rq) {
+               if (i915_request_wait(rq, 0, HZ) < 0) {
+                       pr_err("%ps timed out, size: %u\n", fn, sz);
+                       err = -ETIME;
+               }
+               i915_request_put(rq);
+       }
+
+       for (i = 0; !err && i < sz / PAGE_SIZE; i++) {
+               int x = i * 1024 + i915_prandom_u32_max_state(1024, prng);
+
+               if (vaddr[x] != x) {
+                       pr_err("%ps failed, size: %u, offset: %zu\n",
+                              fn, sz, x * sizeof(u32));
+                       igt_hexdump(vaddr + i * 1024, 4096);
+                       err = -EINVAL;
+               }
+       }
+
+       i915_gem_object_unpin_map(dst);
+       i915_gem_object_unpin_map(src);
+
+err_out:
+       i915_gem_object_put(dst);
+err_free_src:
+       i915_gem_object_put(src);
+
+       return err;
+}
+
+static int __migrate_copy(struct intel_migrate *migrate,
+                         struct i915_gem_ww_ctx *ww,
+                         struct drm_i915_gem_object *src,
+                         struct drm_i915_gem_object *dst,
+                         struct i915_request **out)
+{
+       return intel_migrate_copy(migrate, ww, NULL,
+                                 src->mm.pages->sgl, src->cache_level,
+                                 i915_gem_object_is_lmem(src),
+                                 dst->mm.pages->sgl, dst->cache_level,
+                                 i915_gem_object_is_lmem(dst),
+                                 out);
+}
+
+static int __global_copy(struct intel_migrate *migrate,
+                        struct i915_gem_ww_ctx *ww,
+                        struct drm_i915_gem_object *src,
+                        struct drm_i915_gem_object *dst,
+                        struct i915_request **out)
+{
+       return intel_context_migrate_copy(migrate->context, NULL,
+                                         src->mm.pages->sgl, src->cache_level,
+                                         i915_gem_object_is_lmem(src),
+                                         dst->mm.pages->sgl, dst->cache_level,
+                                         i915_gem_object_is_lmem(dst),
+                                         out);
+}
+
+static int
+migrate_copy(struct intel_migrate *migrate, u32 sz, struct rnd_state *prng)
+{
+       return copy(migrate, __migrate_copy, sz, prng);
+}
+
+static int
+global_copy(struct intel_migrate *migrate, u32 sz, struct rnd_state *prng)
+{
+       return copy(migrate, __global_copy, sz, prng);
+}
+
+static int live_migrate_copy(void *arg)
+{
+       struct intel_migrate *migrate = arg;
+       struct drm_i915_private *i915 = migrate->context->engine->i915;
+       I915_RND_STATE(prng);
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(sizes); i++) {
+               int err;
+
+               err = migrate_copy(migrate, sizes[i], &prng);
+               if (err == 0)
+                       err = global_copy(migrate, sizes[i], &prng);
+               i915_gem_drain_freed_objects(i915);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+
+struct threaded_migrate {
+       struct intel_migrate *migrate;
+       struct task_struct *tsk;
+       struct rnd_state prng;
+};
+
+static int threaded_migrate(struct intel_migrate *migrate,
+                           int (*fn)(void *arg),
+                           unsigned int flags)
+{
+       const unsigned int n_cpus = num_online_cpus() + 1;
+       struct threaded_migrate *thread;
+       I915_RND_STATE(prng);
+       unsigned int i;
+       int err = 0;
+
+       thread = kcalloc(n_cpus, sizeof(*thread), GFP_KERNEL);
+       if (!thread)
+               return 0;
+
+       for (i = 0; i < n_cpus; ++i) {
+               struct task_struct *tsk;
+
+               thread[i].migrate = migrate;
+               thread[i].prng =
+                       I915_RND_STATE_INITIALIZER(prandom_u32_state(&prng));
+
+               tsk = kthread_run(fn, &thread[i], "igt-%d", i);
+               if (IS_ERR(tsk)) {
+                       err = PTR_ERR(tsk);
+                       break;
+               }
+
+               get_task_struct(tsk);
+               thread[i].tsk = tsk;
+       }
+
+       msleep(10); /* start all threads before we kthread_stop() */
+
+       for (i = 0; i < n_cpus; ++i) {
+               struct task_struct *tsk = thread[i].tsk;
+               int status;
+
+               if (IS_ERR_OR_NULL(tsk))
+                       continue;
+
+               status = kthread_stop(tsk);
+               if (status && !err)
+                       err = status;
+
+               put_task_struct(tsk);
+       }
+
+       kfree(thread);
+       return err;
+}
+
+static int __thread_migrate_copy(void *arg)
+{
+       struct threaded_migrate *tm = arg;
+
+       return migrate_copy(tm->migrate, 2 * CHUNK_SZ, &tm->prng);
+}
+
+static int thread_migrate_copy(void *arg)
+{
+       return threaded_migrate(arg, __thread_migrate_copy, 0);
+}
+
+static int __thread_global_copy(void *arg)
+{
+       struct threaded_migrate *tm = arg;
+
+       return global_copy(tm->migrate, 2 * CHUNK_SZ, &tm->prng);
+}
+
+static int thread_global_copy(void *arg)
+{
+       return threaded_migrate(arg, __thread_global_copy, 0);
+}
+
+int intel_migrate_live_selftests(struct drm_i915_private *i915)
+{
+       static const struct i915_subtest tests[] = {
+               SUBTEST(live_migrate_copy),
+               SUBTEST(thread_migrate_copy),
+               SUBTEST(thread_global_copy),
+       };
+       struct intel_migrate m;
+       int err;
+
+       if (intel_migrate_init(&m, &i915->gt))
+               return 0;
+
+       err = i915_subtests(tests, &m);
+       intel_migrate_fini(&m);
+
+       return err;
+}
drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -1
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)
--

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