[PATCH] clear
Matthew Auld
matthew.auld at intel.com
Wed Apr 3 22:58:14 UTC 2019
---
drivers/gpu/drm/i915/Makefile | 2 +
drivers/gpu/drm/i915/i915_drv.h | 3 +
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/i915_gem_client_blt.c | 186 ++++++++++++++++++
drivers/gpu/drm/i915/i915_gem_client_blt.h | 21 ++
drivers/gpu/drm/i915/i915_gem_object_blt.c | 86 ++++++++
drivers/gpu/drm/i915/i915_gem_object_blt.h | 21 ++
drivers/gpu/drm/i915/intel_gpu_commands.h | 1 +
.../drm/i915/selftests/i915_gem_client_blt.c | 105 ++++++++++
.../drm/i915/selftests/i915_gem_object_blt.c | 97 +++++++++
.../drm/i915/selftests/i915_live_selftests.h | 2 +
11 files changed, 525 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/i915/i915_gem_client_blt.c
create mode 100644 drivers/gpu/drm/i915/i915_gem_client_blt.h
create mode 100644 drivers/gpu/drm/i915/i915_gem_object_blt.c
create mode 100644 drivers/gpu/drm/i915/i915_gem_object_blt.h
create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_client_blt.c
create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_object_blt.c
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 30bf3301ea24..ff8394466055 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -74,6 +74,7 @@ i915-y += \
i915_cmd_parser.o \
i915_gem_batch_pool.o \
i915_gem_clflush.o \
+ i915_gem_client_blt.o \
i915_gem_context.o \
i915_gem_dmabuf.o \
i915_gem_evict.o \
@@ -83,6 +84,7 @@ i915-y += \
i915_gem_internal.o \
i915_gem.o \
i915_gem_object.o \
+ i915_gem_object_blt.o \
i915_gem_render_state.o \
i915_gem_shrinker.o \
i915_gem_stolen.o \
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8f38d03b1c4e..6ef5822a3978 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3014,6 +3014,9 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj,
enum i915_mm_subclass subclass);
void __i915_gem_object_invalidate(struct drm_i915_gem_object *obj);
+struct sg_table *
+__i915_gem_object_unset_pages(struct drm_i915_gem_object *obj);
+
enum i915_map_type {
I915_MAP_WB = 0,
I915_MAP_WC,
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index bf594a5e88bc..1d4b65619ed7 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2239,7 +2239,7 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
rcu_read_unlock();
}
-static struct sg_table *
+struct sg_table *
__i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);
diff --git a/drivers/gpu/drm/i915/i915_gem_client_blt.c b/drivers/gpu/drm/i915/i915_gem_client_blt.c
new file mode 100644
index 000000000000..b6fd96ab4a55
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_gem_client_blt.c
@@ -0,0 +1,186 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+#include "i915_gem_client_blt.h"
+
+#include "i915_gem_object_blt.h"
+#include "intel_drv.h"
+
+static struct drm_i915_gem_object *
+create_sleeve(struct drm_i915_private *i915,
+ struct sg_table *pages,
+ unsigned int page_sizes,
+ u64 size)
+{
+ struct drm_i915_gem_object *sleeve;
+
+ /* XXX: sketchy af */
+ sleeve = i915_gem_object_create_internal(i915, size);
+ if (IS_ERR(sleeve))
+ return sleeve;
+
+ mutex_lock(&sleeve->mm.lock);
+
+ atomic_inc(&sleeve->mm.pages_pin_count);
+ __i915_gem_object_set_pages(sleeve, pages, page_sizes);
+
+ mutex_unlock(&sleeve->mm.lock);
+
+ return sleeve;
+}
+
+static void destroy_sleeve(struct drm_i915_gem_object *sleeve)
+{
+ mutex_lock(&sleeve->mm.lock);
+
+ __i915_gem_object_unset_pages(sleeve);
+ atomic_dec(&sleeve->mm.pages_pin_count);
+
+ mutex_unlock(&sleeve->mm.lock);
+
+ i915_gem_object_put(sleeve);
+}
+
+struct clear_pages_work {
+ struct dma_fence dma;
+ struct i915_sw_fence wait;
+ struct work_struct work;
+ struct drm_i915_gem_object *sleeve;
+ struct drm_i915_gem_object *obj;
+ struct i915_gem_context *ctx;
+ u32 value;
+};
+
+static const char *clear_pages_work_driver_name(struct dma_fence *fence)
+{
+ return DRIVER_NAME;
+}
+
+static const char *clear_pages_work_timeline_name(struct dma_fence *fence)
+{
+ return "clear";
+}
+
+static void clear_pages_work_release(struct dma_fence *fence)
+{
+ struct clear_pages_work *w = container_of(fence, typeof(*w), dma);
+
+ i915_sw_fence_fini(&w->wait);
+
+ BUILD_BUG_ON(offsetof(typeof(*w), dma));
+ dma_fence_free(&w->dma);
+}
+
+static const struct dma_fence_ops clear_pages_work_ops = {
+ .get_driver_name = clear_pages_work_driver_name,
+ .get_timeline_name = clear_pages_work_timeline_name,
+ .release = clear_pages_work_release,
+};
+
+/* XXX: needs to be taken out and shot */
+static void i915_clear_pages_worker(struct work_struct *work)
+{
+ struct clear_pages_work *w = container_of(work, typeof(*w), work);
+ struct drm_i915_private *i915 = w->ctx->i915;
+ intel_wakeref_t wakeref;
+ int err;
+
+ mutex_lock(&i915->drm.struct_mutex);
+
+ wakeref = intel_runtime_pm_get(i915);
+ err = i915_gem_object_fill_blt(w->ctx, w->sleeve, w->value);
+ intel_runtime_pm_put(i915, wakeref);
+
+ if (unlikely(err))
+ dma_fence_set_error(&w->dma, err);
+
+ err = i915_gem_object_unbind(w->sleeve);
+ if (unlikely(err))
+ dma_fence_set_error(&w->dma, err);
+
+ mutex_unlock(&i915->drm.struct_mutex);
+
+ i915_gem_object_put(w->obj);
+ i915_gem_context_put(w->ctx);
+
+ destroy_sleeve(w->sleeve);
+
+ dma_fence_signal(&w->dma);
+ dma_fence_put(&w->dma);
+}
+
+static int __i915_sw_fence_call
+clear_pages_work_notify(struct i915_sw_fence *fence,
+ enum i915_sw_fence_notify state)
+{
+ struct clear_pages_work *w = container_of(fence, typeof(*w), wait);
+
+ switch (state) {
+ case FENCE_COMPLETE:
+ schedule_work(&w->work);
+ break;
+
+ case FENCE_FREE:
+ dma_fence_put(&w->dma);
+ break;
+ }
+
+ return NOTIFY_DONE;
+}
+
+static DEFINE_SPINLOCK(fence_lock);
+
+int i915_gem_schedule_fill_pages_blt(struct drm_i915_gem_object *obj,
+ struct i915_gem_context *ctx,
+ struct sg_table *pages,
+ unsigned int page_sizes,
+ u64 size,
+ u32 value)
+{
+ struct drm_i915_gem_object *sleeve;
+ struct clear_pages_work *work;
+
+ sleeve = create_sleeve(ctx->i915, pages, page_sizes, size);
+ if (IS_ERR(sleeve))
+ return PTR_ERR(sleeve);
+
+ work = kmalloc(sizeof(*work), GFP_KERNEL);
+ if (work == NULL) {
+ destroy_sleeve(sleeve);
+ return -ENOMEM;
+ }
+
+ work->value = value;
+ work->sleeve = sleeve;
+ work->obj = i915_gem_object_get(obj);
+ work->ctx = i915_gem_context_get(ctx);
+
+ INIT_WORK(&work->work, i915_clear_pages_worker);
+
+ dma_fence_init(&work->dma,
+ &clear_pages_work_ops,
+ &fence_lock,
+ to_i915(obj->base.dev)->mm.unordered_timeline,
+ 0);
+ i915_sw_fence_init(&work->wait, clear_pages_work_notify);
+
+ dma_fence_get(&work->dma);
+
+ i915_sw_fence_await_reservation(&work->wait,
+ obj->resv, NULL,
+ true, I915_FENCE_TIMEOUT,
+ I915_FENCE_GFP);
+
+ i915_gem_object_lock(obj);
+ reservation_object_add_excl_fence(obj->resv, &work->dma);
+ i915_gem_object_unlock(obj);
+
+ i915_sw_fence_commit(&work->wait);
+
+ return 0;
+}
+
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
+#include "selftests/i915_gem_client_blt.c"
+#endif
diff --git a/drivers/gpu/drm/i915/i915_gem_client_blt.h b/drivers/gpu/drm/i915/i915_gem_client_blt.h
new file mode 100644
index 000000000000..e5dd07b7462a
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_gem_client_blt.h
@@ -0,0 +1,21 @@
+/* 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_gem_context;
+struct sg_table;
+
+int i915_gem_schedule_fill_pages_blt(struct drm_i915_gem_object *obj,
+ struct i915_gem_context *ctx,
+ struct sg_table *pages,
+ unsigned int page_sizes,
+ u64 size,
+ u32 value);
+
+#endif
diff --git a/drivers/gpu/drm/i915/i915_gem_object_blt.c b/drivers/gpu/drm/i915/i915_gem_object_blt.c
new file mode 100644
index 000000000000..5dcb4c906e24
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_gem_object_blt.c
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#include "i915_gem_object_blt.h"
+
+#include "intel_drv.h"
+
+int i915_gem_object_fill_blt(struct i915_gem_context *ctx,
+ struct drm_i915_gem_object *obj,
+ u32 value)
+{
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+ struct intel_engine_cs *engine = i915->engine[BCS0];
+ struct i915_address_space *vm;
+ struct i915_request *rq;
+ struct i915_vma *vma;
+ u32 *cs;
+ int err;
+
+ lockdep_assert_held(&i915->drm.struct_mutex);
+
+ vm = ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm;
+
+ vma = i915_vma_instance(obj, vm, NULL);
+ if (IS_ERR(vma)) {
+ err = PTR_ERR(vma);
+ return err;
+ }
+
+ err = i915_vma_pin(vma, 0, 0, PIN_USER);
+ if (err) {
+ i915_vma_close(vma);
+ return err;
+ }
+
+ rq = i915_request_alloc(engine, ctx);
+ if (IS_ERR(rq)) {
+ err = PTR_ERR(rq);
+ goto err_unpin;
+ }
+
+ cs = intel_ring_begin(rq, 8);
+
+ if (INTEL_GEN(i915) >= 8) {
+ *cs++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (7-2);
+ *cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;
+ *cs++ = 0;
+ *cs++ = obj->base.size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+ *cs++ = lower_32_bits(vma->node.start);
+ *cs++ = upper_32_bits(vma->node.start);
+ *cs++ = value;
+ *cs++ = MI_NOOP;
+ } else {
+ *cs++ = XY_COLOR_BLT_CMD | BLT_WRITE_RGBA | (6-2);
+ *cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | PAGE_SIZE;
+ *cs++ = 0;
+ *cs++ = obj->base.size >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+ *cs++ = vma->node.start;
+ *cs++ = value;
+ *cs++ = MI_NOOP;
+ *cs++ = MI_NOOP;
+ }
+
+ intel_ring_advance(rq, cs);
+
+ err = i915_vma_move_to_active(vma, rq, EXEC_OBJECT_WRITE);
+ if (err)
+ i915_request_skip(rq, err);
+
+ i915_request_add(rq);
+err_unpin:
+ i915_vma_unpin(vma);
+ return err;
+}
+
+int i915_gem_object_clear_blt(struct i915_gem_context *ctx,
+ struct drm_i915_gem_object *obj)
+{
+ return i915_gem_object_fill_blt(ctx, obj, 0);
+}
+
+#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
+#include "selftests/i915_gem_object_blt.c"
+#endif
diff --git a/drivers/gpu/drm/i915/i915_gem_object_blt.h b/drivers/gpu/drm/i915/i915_gem_object_blt.h
new file mode 100644
index 000000000000..40d3f4d2f910
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_gem_object_blt.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_GEM_OBJECT_BLT_H__
+#define __I915_GEM_OBJECT_BLT_H__
+
+#include <linux/types.h>
+
+struct drm_i915_gem_object;
+struct i915_gem_context;
+
+int i915_gem_object_clear_blt(struct i915_gem_context *ctx,
+ struct drm_i915_gem_object *obj);
+
+int i915_gem_object_fill_blt(struct i915_gem_context *ctx,
+ struct drm_i915_gem_object *obj,
+ u32 value);
+
+#endif
diff --git a/drivers/gpu/drm/i915/intel_gpu_commands.h b/drivers/gpu/drm/i915/intel_gpu_commands.h
index a34ece53a771..7e95827b0726 100644
--- a/drivers/gpu/drm/i915/intel_gpu_commands.h
+++ b/drivers/gpu/drm/i915/intel_gpu_commands.h
@@ -180,6 +180,7 @@
#define GFX_OP_DRAWRECT_INFO_I965 ((0x7900<<16)|0x2)
#define COLOR_BLT_CMD (2<<29 | 0x40<<22 | (5-2))
+#define XY_COLOR_BLT_CMD (2<<29 | 0x50<<22)
#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|4)
#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6)
#define XY_MONO_SRC_COPY_IMM_BLT ((2<<29)|(0x71<<22)|5)
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_client_blt.c b/drivers/gpu/drm/i915/selftests/i915_gem_client_blt.c
new file mode 100644
index 000000000000..b63f4c2dc502
--- /dev/null
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_client_blt.c
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#include "../i915_selftest.h"
+
+#include "mock_drm.h"
+#include "mock_context.h"
+
+static int igt_client_fill(void *arg)
+{
+ struct i915_gem_context *ctx = arg;
+ struct drm_i915_private *i915 = ctx->i915;
+ struct drm_i915_gem_object *obj;
+ struct rnd_state prng;
+ IGT_TIMEOUT(end);
+ u32 *vaddr;
+ int err = 0;
+
+ obj = i915_gem_object_create_internal(i915, SZ_2M);
+ if (IS_ERR(obj))
+ return PTR_ERR(obj);
+
+ vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
+ if (IS_ERR(vaddr)) {
+ err = PTR_ERR(vaddr);
+ goto err_put;
+ }
+
+ prandom_seed_state(&prng, i915_selftest.random_seed);
+
+ do {
+ u32 val = prandom_u32_state(&prng);
+ u32 i;
+
+ err = i915_gem_schedule_fill_pages_blt(obj, ctx, obj->mm.pages,
+ obj->mm.page_sizes.phys,
+ obj->base.size,
+ val);
+ if (err)
+ break;
+
+ err = i915_gem_object_wait(obj,
+ I915_WAIT_INTERRUPTIBLE |
+ I915_WAIT_ALL,
+ MAX_SCHEDULE_TIMEOUT);
+ if (err)
+ break;
+
+ mutex_lock(&i915->drm.struct_mutex);
+ err = i915_gem_object_set_to_cpu_domain(obj, false);
+ mutex_unlock(&i915->drm.struct_mutex);
+ if (err)
+ break;
+
+ for (i = 0; i < obj->base.size / sizeof(u32); ++i) {
+ if (vaddr[i] != val) {
+ pr_err("vaddr[%d]=%u, expected=%u\n", i,
+ val, vaddr[i]);
+ err = -EINVAL;
+ break;
+ }
+ }
+ } while (!time_after(jiffies, end));
+
+ i915_gem_object_unpin_map(obj);
+err_put:
+ i915_gem_object_put(obj);
+ return err;
+}
+
+int i915_gem_client_blt_live_selftests(struct drm_i915_private *i915)
+{
+ static const struct i915_subtest tests[] = {
+ SUBTEST(igt_client_fill),
+ };
+ struct drm_file *file;
+ struct i915_gem_context *ctx;
+ intel_wakeref_t wakeref;
+ int err;
+
+ if (i915_terminally_wedged(i915))
+ return 0;
+
+ file = mock_file(i915);
+ if (IS_ERR(file))
+ return PTR_ERR(file);
+
+ wakeref = intel_runtime_pm_get(i915);
+
+ ctx = live_context(i915, file);
+ if (IS_ERR(ctx)) {
+ err = PTR_ERR(ctx);
+ goto out_unlock;
+ }
+
+ err = i915_subtests(tests, ctx);
+
+out_unlock:
+ intel_runtime_pm_put(i915, wakeref);
+
+ mock_file_free(i915, file);
+ return err;
+}
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_object_blt.c b/drivers/gpu/drm/i915/selftests/i915_gem_object_blt.c
new file mode 100644
index 000000000000..8be29a3b14a0
--- /dev/null
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_object_blt.c
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#include "../i915_selftest.h"
+
+#include "mock_drm.h"
+#include "mock_context.h"
+
+static int igt_fill_blt(void *arg)
+{
+ struct i915_gem_context *ctx = arg;
+ struct drm_i915_private *i915 = ctx->i915;
+ struct drm_i915_gem_object *obj;
+ struct rnd_state prng;
+ IGT_TIMEOUT(end);
+ u32 *vaddr;
+ int err = 0;
+
+ obj = i915_gem_object_create_internal(i915, SZ_2M);
+ if (IS_ERR(obj))
+ return PTR_ERR(obj);
+
+ vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
+ if (IS_ERR(vaddr)) {
+ err = PTR_ERR(vaddr);
+ goto err_put;
+ }
+
+ prandom_seed_state(&prng, i915_selftest.random_seed);
+
+ do {
+ u32 val = prandom_u32_state(&prng);
+ u32 i;
+
+ mutex_lock(&i915->drm.struct_mutex);
+ err = i915_gem_object_fill_blt(ctx, obj, val);
+ mutex_unlock(&i915->drm.struct_mutex);
+ if (err)
+ break;
+
+ mutex_lock(&i915->drm.struct_mutex);
+ err = i915_gem_object_set_to_cpu_domain(obj, false);
+ mutex_unlock(&i915->drm.struct_mutex);
+ if (err)
+ break;
+
+ for (i = 0; i < obj->base.size / sizeof(u32); ++i) {
+ if (vaddr[i] != val) {
+ pr_err("vaddr[%d]=%u, expected=%u\n", i,
+ val, vaddr[i]);
+ err = -EINVAL;
+ break;
+ }
+ }
+ } while (!time_after(jiffies, end));
+
+ i915_gem_object_unpin_map(obj);
+err_put:
+ i915_gem_object_put(obj);
+ return err;
+}
+
+int i915_gem_object_blt_live_selftests(struct drm_i915_private *i915)
+{
+ static const struct i915_subtest tests[] = {
+ SUBTEST(igt_fill_blt),
+ };
+ struct drm_file *file;
+ struct i915_gem_context *ctx;
+ intel_wakeref_t wakeref;
+ int err;
+
+ if (i915_terminally_wedged(i915))
+ return 0;
+
+ file = mock_file(i915);
+ if (IS_ERR(file))
+ return PTR_ERR(file);
+
+ wakeref = intel_runtime_pm_get(i915);
+
+ ctx = live_context(i915, file);
+ if (IS_ERR(ctx)) {
+ err = PTR_ERR(ctx);
+ goto out_unlock;
+ }
+
+ err = i915_subtests(tests, ctx);
+
+out_unlock:
+ intel_runtime_pm_put(i915, wakeref);
+
+ mock_file_free(i915, file);
+ return err;
+}
diff --git a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h
index 6d766925ad04..3797574e1984 100644
--- a/drivers/gpu/drm/i915/selftests/i915_live_selftests.h
+++ b/drivers/gpu/drm/i915/selftests/i915_live_selftests.h
@@ -23,6 +23,8 @@ selftest(gem, i915_gem_live_selftests)
selftest(evict, i915_gem_evict_live_selftests)
selftest(hugepages, i915_gem_huge_page_live_selftests)
selftest(contexts, i915_gem_context_live_selftests)
+selftest(blt, i915_gem_object_blt_live_selftests)
+selftest(client, i915_gem_client_blt_live_selftests)
selftest(hangcheck, intel_hangcheck_live_selftests)
selftest(execlists, intel_execlists_live_selftests)
selftest(guc, intel_guc_live_selftest)
--
2.20.1
More information about the Intel-gfx-trybot
mailing list