We will need this to support eviction with lmem, so explicitly pass ww as a parameter.
Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com --- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_region.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_region.h | 4 +++- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 3 ++- drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c | 3 ++- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 9 ++++++--- drivers/gpu/drm/i915/gvt/dmabuf.c | 3 ++- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 ++- 13 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index 0926e0895ee6..1b3998c066a7 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -199,7 +199,8 @@ struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags) return drm_gem_dmabuf_export(gem_obj->dev, &exp_info); }
-static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) +static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct sg_table *pages; unsigned int sg_page_sizes; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_internal.c b/drivers/gpu/drm/i915/gem/i915_gem_internal.c index 21cc40897ca8..90777fb5f5e0 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_internal.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_internal.c @@ -30,7 +30,8 @@ static void internal_free_pages(struct sg_table *st) kfree(st); }
-static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) +static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct drm_i915_private *i915 = to_i915(obj->base.dev); struct sg_table *st; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index a5bc42c7087a..280f54a75ab1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -50,7 +50,8 @@ struct drm_i915_gem_object_ops { * being released or under memory pressure (where we attempt to * reap pages for the shrinker). */ - int (*get_pages)(struct drm_i915_gem_object *obj); + int (*get_pages)(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww); void (*put_pages)(struct drm_i915_gem_object *obj, struct sg_table *pages); void (*truncate)(struct drm_i915_gem_object *obj); diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index aed8a37ccdc9..58e222030e10 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -100,7 +100,7 @@ int ____i915_gem_object_get_pages(struct drm_i915_gem_object *obj) return -EFAULT; }
- err = obj->ops->get_pages(obj); + err = obj->ops->get_pages(obj, NULL); GEM_BUG_ON(!err && !i915_gem_object_has_pages(obj));
return err; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c index 6a84fb6dde24..6cb8b70c19bf 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c @@ -20,7 +20,8 @@ i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj, }
int -i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) +i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { const u64 max_segment = i915_sg_segment_size(); struct intel_memory_region *mem = obj->mm.region; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.h b/drivers/gpu/drm/i915/gem/i915_gem_region.h index ebddc86d78f7..c6f250aac925 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_region.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.h @@ -9,10 +9,12 @@ #include <linux/types.h>
struct intel_memory_region; +struct i915_gem_ww_ctx; struct drm_i915_gem_object; struct sg_table;
-int i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj); +int i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww); void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj, struct sg_table *pages);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index a9bfa66c8da1..3f80a017959a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -25,7 +25,8 @@ static void check_release_pagevec(struct pagevec *pvec) cond_resched(); }
-static int shmem_get_pages(struct drm_i915_gem_object *obj) +static int shmem_get_pages(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct drm_i915_private *i915 = to_i915(obj->base.dev); struct intel_memory_region *mem = obj->mm.region; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index b0597de206de..5b732b0fe5ce 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -568,7 +568,8 @@ i915_pages_create_for_stolen(struct drm_device *dev, return st; }
-static int i915_gem_object_get_pages_stolen(struct drm_i915_gem_object *obj) +static int i915_gem_object_get_pages_stolen(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct sg_table *pages = i915_pages_create_for_stolen(obj->base.dev, diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 09b4219eab5d..693d0dbe9ed2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -126,7 +126,8 @@ static void i915_gem_object_userptr_drop_ref(struct drm_i915_gem_object *obj) } }
-static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) +static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct drm_i915_private *i915 = to_i915(obj->base.dev); const unsigned long num_pages = obj->base.size >> PAGE_SHIFT; diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c b/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c index 0c8ecfdf5405..6ce237a5e38d 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c @@ -25,7 +25,8 @@ static void huge_free_pages(struct drm_i915_gem_object *obj, kfree(pages); }
-static int huge_get_pages(struct drm_i915_gem_object *obj) +static int huge_get_pages(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { #define GFP (GFP_KERNEL | __GFP_NOWARN | __GFP_RETRY_MAYFAIL) const unsigned long nreal = obj->scratch / PAGE_SIZE; diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c index d85ca79ac433..80eeb59aae67 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c @@ -56,7 +56,8 @@ static void huge_pages_free_pages(struct sg_table *st) kfree(st); }
-static int get_huge_pages(struct drm_i915_gem_object *obj) +static int get_huge_pages(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { #define GFP (GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY) unsigned int page_mask = obj->mm.page_mask; @@ -179,7 +180,8 @@ huge_pages_object(struct drm_i915_private *i915, return obj; }
-static int fake_get_huge_pages(struct drm_i915_gem_object *obj) +static int fake_get_huge_pages(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct drm_i915_private *i915 = to_i915(obj->base.dev); const u64 max_len = rounddown_pow_of_two(UINT_MAX); @@ -234,7 +236,8 @@ static int fake_get_huge_pages(struct drm_i915_gem_object *obj) return 0; }
-static int fake_get_huge_pages_single(struct drm_i915_gem_object *obj) +static int fake_get_huge_pages_single(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct drm_i915_private *i915 = to_i915(obj->base.dev); struct sg_table *st; diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c index d4f883f35b95..609257aaf711 100644 --- a/drivers/gpu/drm/i915/gvt/dmabuf.c +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c @@ -55,7 +55,8 @@ static void vgpu_unpin_dma_address(struct intel_vgpu *vgpu, }
static int vgpu_gem_get_pages( - struct drm_i915_gem_object *obj) + struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); struct intel_vgpu *vgpu; diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 2e4f06eaacc1..fc92fed7a04a 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -50,7 +50,8 @@ static void fake_free_pages(struct drm_i915_gem_object *obj, kfree(pages); }
-static int fake_get_pages(struct drm_i915_gem_object *obj) +static int fake_get_pages(struct drm_i915_gem_object *obj, + struct i915_gem_ww_ctx *ww) { #define GFP (GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY) #define PFN_BIAS 0x1000