This will allow us to explicitly pass the ww to pin_pages, when it starts taking it.
Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com --- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 7 ++++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 ++ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c | 4 ++-- drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c index e3537922183b..a5b3a21faf9c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c @@ -534,6 +534,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, * flush the object from the CPU cache. */ int i915_gem_object_prepare_read(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww, unsigned int *needs_clflush) { int ret; @@ -578,6 +579,7 @@ int i915_gem_object_prepare_read(struct drm_i915_gem_object *obj, }
int i915_gem_object_prepare_write(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww, unsigned int *needs_clflush) { int ret; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index f85ca10bf7f3..dcfcae9c841b 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1154,9 +1154,10 @@ static void reloc_cache_reset(struct reloc_cache *cache, struct i915_execbuffer }
static void *reloc_kmap(struct drm_i915_gem_object *obj, - struct reloc_cache *cache, + struct i915_execbuffer *eb, unsigned long pageno) { + struct reloc_cache *cache = &eb->reloc_cache; void *vaddr; struct page *page;
@@ -1166,7 +1167,7 @@ static void *reloc_kmap(struct drm_i915_gem_object *obj, unsigned int flushes; int err;
- err = i915_gem_object_prepare_write(obj, &flushes); + err = i915_gem_object_prepare_write(obj, &eb->ww, &flushes); if (err) return ERR_PTR(err);
@@ -1266,7 +1267,7 @@ static void *reloc_vaddr(struct drm_i915_gem_object *obj, if ((cache->vaddr & KMAP) == 0) vaddr = reloc_iomap(obj, eb, page); if (!vaddr) - vaddr = reloc_kmap(obj, cache, page); + vaddr = reloc_kmap(obj, eb, page); }
return vaddr; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index 7a252dc4237f..1a8ec4035112 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -480,8 +480,10 @@ static inline void i915_gem_object_unpin_map(struct drm_i915_gem_object *obj) void __i915_gem_object_release_map(struct drm_i915_gem_object *obj);
int i915_gem_object_prepare_read(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww, unsigned int *needs_clflush); int i915_gem_object_prepare_write(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww, unsigned int *needs_clflush); #define CLFLUSH_BEFORE BIT(0) #define CLFLUSH_AFTER BIT(1) diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c index 80eeb59aae67..8b07bb77bb86 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c @@ -987,7 +987,7 @@ __cpu_check_shmem(struct drm_i915_gem_object *obj, u32 dword, u32 val) int err;
i915_gem_object_lock(obj, NULL); - err = i915_gem_object_prepare_read(obj, &needs_flush); + err = i915_gem_object_prepare_read(obj, NULL, &needs_flush); if (err) goto err_unlock;
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c index 8f2e447bd503..8f5b1e44d534 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c @@ -29,7 +29,7 @@ static int cpu_set(struct context *ctx, unsigned long offset, u32 v) int err;
i915_gem_object_lock(ctx->obj, NULL); - err = i915_gem_object_prepare_write(ctx->obj, &needs_clflush); + err = i915_gem_object_prepare_write(ctx->obj, NULL, &needs_clflush); if (err) goto out;
@@ -62,7 +62,7 @@ static int cpu_get(struct context *ctx, unsigned long offset, u32 *v) int err;
i915_gem_object_lock(ctx->obj, NULL); - err = i915_gem_object_prepare_read(ctx->obj, &needs_clflush); + err = i915_gem_object_prepare_read(ctx->obj, NULL, &needs_clflush); if (err) goto out;
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c index 82d5d37e9b66..af5f29a8a7f2 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c @@ -462,7 +462,7 @@ static int cpu_fill(struct drm_i915_gem_object *obj, u32 value) int err;
i915_gem_object_lock(obj, NULL); - err = i915_gem_object_prepare_write(obj, &need_flush); + err = i915_gem_object_prepare_write(obj, NULL, &need_flush); if (err) goto out;
@@ -492,7 +492,7 @@ static noinline int cpu_check(struct drm_i915_gem_object *obj, int err;
i915_gem_object_lock(obj, NULL); - err = i915_gem_object_prepare_read(obj, &needs_flush); + err = i915_gem_object_prepare_read(obj, NULL, &needs_flush); if (err) goto out_unlock;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 2ba53b229c65..960e94997c9b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -216,7 +216,7 @@ i915_gem_shmem_pread(struct drm_i915_gem_object *obj, if (ret) goto err_unlock;
- ret = i915_gem_object_prepare_read(obj, &needs_clflush); + ret = i915_gem_object_prepare_read(obj, NULL, &needs_clflush); if (ret) goto err_unpin;
@@ -644,7 +644,7 @@ i915_gem_shmem_pwrite(struct drm_i915_gem_object *obj, if (ret) goto err_unlock;
- ret = i915_gem_object_prepare_write(obj, &needs_clflush); + ret = i915_gem_object_prepare_write(obj, NULL, &needs_clflush); if (ret) goto err_unpin;