Re: [Intel-gfx] [RFC PATCH 103/162] drm/i915: allocate context from LMEM

[Chris Wilson]

Quoting Matthew Auld (2020-11-27 12:06:19)
> Based on a patch from Michel Thierry.
> 
> Signed-off-by: Matthew Auld 
> Cc: Joonas Lahtinen 
> Cc: Abdiel Janulgue 
> ---
>  .../drm/i915/gt/intel_execlists_submission.c  | 31 ++-
>  1 file changed, 30 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c 
> b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 582a9044727e..c640b90711fd 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -108,6 +108,8 @@
>   */
>  #include 
>  
> +#include "gem/i915_gem_lmem.h"
> +
>  #include "i915_drv.h"
>  #include "i915_perf.h"
>  #include "i915_trace.h"
> @@ -4660,6 +4662,21 @@ static struct intel_timeline *pinned_timeline(struct 
> intel_context *ce)
>  page_unmask_bits(tl));
>  }
>  
> +static int context_clear_lmem(struct drm_i915_gem_object *ctx_obj)
> +{
> +   void *vaddr;
> +
> +   vaddr = i915_gem_object_pin_map(ctx_obj, I915_MAP_WC);
> +   if (IS_ERR(vaddr))
> +   return PTR_ERR(vaddr);
> +
> +   memset64(vaddr, 0, ctx_obj->base.size / sizeof(u64));
> +
> +   i915_gem_object_unpin_map(ctx_obj);

What? We copy over the entire object with the default state.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [RFC PATCH 103/162] drm/i915: allocate context from LMEM

[Matthew Auld]

Based on a patch from Michel Thierry.

Signed-off-by: Matthew Auld 
Cc: Joonas Lahtinen 
Cc: Abdiel Janulgue 
---
 .../drm/i915/gt/intel_execlists_submission.c  | 31 ++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c 
b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 582a9044727e..c640b90711fd 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -108,6 +108,8 @@
  */
 #include 
 
+#include "gem/i915_gem_lmem.h"
+
 #include "i915_drv.h"
 #include "i915_perf.h"
 #include "i915_trace.h"
@@ -4660,6 +4662,21 @@ static struct intel_timeline *pinned_timeline(struct 
intel_context *ce)
 page_unmask_bits(tl));
 }
 
+static int context_clear_lmem(struct drm_i915_gem_object *ctx_obj)
+{
+   void *vaddr;
+
+   vaddr = i915_gem_object_pin_map(ctx_obj, I915_MAP_WC);
+   if (IS_ERR(vaddr))
+   return PTR_ERR(vaddr);
+
+   memset64(vaddr, 0, ctx_obj->base.size / sizeof(u64));
+
+   i915_gem_object_unpin_map(ctx_obj);
+
+   return 0;
+}
+
 static int __execlists_context_alloc(struct intel_context *ce,
 struct intel_engine_cs *engine)
 {
@@ -4680,10 +4697,22 @@ static int __execlists_context_alloc(struct 
intel_context *ce,
context_size += PAGE_SIZE;
}
 
-   ctx_obj = i915_gem_object_create_shmem(engine->i915, context_size);
+   if (HAS_LMEM(engine->i915)) {
+   ctx_obj = i915_gem_object_create_lmem(engine->i915,
+ context_size,
+ I915_BO_ALLOC_CONTIGUOUS);
+   } else {
+   ctx_obj = i915_gem_object_create_shmem(engine->i915, 
context_size);
+   }
if (IS_ERR(ctx_obj))
return PTR_ERR(ctx_obj);
 
+   if (HAS_LMEM(engine->i915)) {
+   ret = context_clear_lmem(ctx_obj);
+   if (ret)
+   goto error_deref_obj;
+   }
+
vma = i915_vma_instance(ctx_obj, &engine->gt->ggtt->vm, NULL);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);
-- 
2.26.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx