[PATCH 6/8] flush
Matthew Auld
matthew.auld at intel.com
Wed Jul 29 11:21:44 UTC 2020
---
.../drm/i915/gem/selftests/i915_gem_context.c | 2 +-
drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 6 ++--
drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 28 +++++++++++--------
drivers/gpu/drm/i915/gt/intel_gtt.c | 18 ++++++++----
drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +--
drivers/gpu/drm/i915/gt/intel_ppgtt.c | 6 ++--
drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +-
7 files changed, 41 insertions(+), 25 deletions(-)
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 c56e86750817..56258ca75ac1 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -1752,7 +1752,7 @@ static int check_scratch_page(struct i915_gem_context *ctx, u32 *out)
return -EINVAL;
}
- vaddr = __px_vaddr(vm->scratch[0]);
+ vaddr = __px_vaddr(vm->scratch[0], NULL);
memcpy(out, vaddr, sizeof(*out));
if (memchr_inv(vaddr, *out, PAGE_SIZE)) {
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index 6a00a34d9084..4eb64a5ba299 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -105,7 +105,7 @@ static void gen6_ppgtt_clear_range(struct i915_address_space *vm,
* entries back to scratch.
*/
- vaddr = px_vaddr(pt);
+ vaddr = px_vaddr(pt, NULL);
memset32(vaddr + pte, scratch_pte, count);
pte = 0;
@@ -128,7 +128,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
GEM_BUG_ON(!pd->entry[act_pt]);
- vaddr = px_vaddr(i915_pt_entry(pd, act_pt));
+ vaddr = px_vaddr(i915_pt_entry(pd, act_pt), NULL);
do {
GEM_BUG_ON(iter.sg->length < I915_GTT_PAGE_SIZE);
vaddr[act_pte] = pte_encode | GEN6_PTE_ADDR_ENCODE(iter.dma);
@@ -144,7 +144,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
}
if (++act_pte == GEN6_PTES) {
- vaddr = px_vaddr(i915_pt_entry(pd, ++act_pt));
+ vaddr = px_vaddr(i915_pt_entry(pd, ++act_pt), NULL);
act_pte = 0;
}
} while (1);
diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
index 19108ef9c252..ec34284f2ba1 100644
--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
@@ -237,7 +237,7 @@ static u64 __gen8_ppgtt_clear(struct i915_address_space * const vm,
atomic_read(&pt->used));
GEM_BUG_ON(!count || count >= atomic_read(&pt->used));
- vaddr = px_vaddr(pt);
+ vaddr = px_vaddr(pt, NULL);
memset64(vaddr + gen8_pd_index(start, 0),
vm->scratch[0]->encode,
count);
@@ -367,9 +367,10 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt,
struct i915_page_directory *pd;
const gen8_pte_t pte_encode = gen8_pte_encode(0, cache_level, flags);
gen8_pte_t *vaddr;
+ bool needs_flush;
pd = i915_pd_entry(pdp, gen8_pd_index(idx, 2));
- vaddr = px_vaddr(i915_pt_entry(pd, gen8_pd_index(idx, 1)));
+ vaddr = px_vaddr(i915_pt_entry(pd, gen8_pd_index(idx, 1)), &needs_flush);
do {
GEM_BUG_ON(iter->sg->length < I915_GTT_PAGE_SIZE);
vaddr[gen8_pd_index(idx, 0)] = pte_encode | iter->dma;
@@ -395,11 +396,14 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt,
pd = pdp->entry[gen8_pd_index(idx, 2)];
}
- clflush_cache_range(vaddr, PAGE_SIZE);
- vaddr = px_vaddr(i915_pt_entry(pd, gen8_pd_index(idx, 1)));
+ if (needs_flush)
+ clflush_cache_range(vaddr, PAGE_SIZE);
+ vaddr = px_vaddr(i915_pt_entry(pd, gen8_pd_index(idx, 1)),
+ &needs_flush);
}
} while (1);
- clflush_cache_range(vaddr, PAGE_SIZE);
+ if (needs_flush)
+ clflush_cache_range(vaddr, PAGE_SIZE);
return idx;
}
@@ -412,6 +416,7 @@ static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
const gen8_pte_t pte_encode = gen8_pte_encode(0, cache_level, flags);
u64 start = vma->node.start;
dma_addr_t rem = iter->sg->length;
+ bool needs_flush;
GEM_BUG_ON(!i915_vm_is_4lvl(vma->vm));
@@ -434,7 +439,7 @@ static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
encode |= GEN8_PDE_PS_2M;
page_size = I915_GTT_PAGE_SIZE_2M;
- vaddr = px_vaddr(pd);
+ vaddr = px_vaddr(pd, &needs_flush);
} else {
struct i915_page_table *pt =
i915_pt_entry(pd, __gen8_pte_index(start, 1));
@@ -449,7 +454,7 @@ static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
rem >= (I915_PDES - index) * I915_GTT_PAGE_SIZE))
maybe_64K = __gen8_pte_index(start, 1);
- vaddr = px_vaddr(pt);
+ vaddr = px_vaddr(pt, &needs_flush);
}
do {
@@ -479,7 +484,8 @@ static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
}
} while (rem >= page_size && index < I915_PDES);
- clflush_cache_range(vaddr, PAGE_SIZE);
+ if (needs_flush)
+ clflush_cache_range(vaddr, PAGE_SIZE);
/*
* Is it safe to mark the 2M block as 64K? -- Either we have
@@ -493,7 +499,7 @@ static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
!iter->sg && IS_ALIGNED(vma->node.start +
vma->node.size,
I915_GTT_PAGE_SIZE_2M)))) {
- vaddr = px_vaddr(pd);
+ vaddr = px_vaddr(pd, NULL);
vaddr[maybe_64K] |= GEN8_PDE_IPS_64K;
page_size = I915_GTT_PAGE_SIZE_64K;
@@ -510,7 +516,7 @@ static void gen8_ppgtt_insert_huge(struct i915_vma *vma,
u16 i;
encode = vma->vm->scratch[0]->encode;
- vaddr = px_vaddr(i915_pt_entry(pd, maybe_64K));
+ vaddr = px_vaddr(i915_pt_entry(pd, maybe_64K), NULL);
for (i = 1; i < index; i += 16)
memset64(vaddr + i, encode, 15);
@@ -733,7 +739,7 @@ int flat_lmem_ppgtt_init(struct i915_address_space *vm,
start = node->start;
size = node->size;
- vaddr = px_vaddr(pd);
+ vaddr = px_vaddr(pd, NULL);
do {
vaddr[idx++] = encode | GEN8_PDPE_PS_1G | start;
size -= min_t(u64, size, SZ_1G);
diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.c b/drivers/gpu/drm/i915/gt/intel_gtt.c
index 72edb053b86b..ed3573bda55c 100644
--- a/drivers/gpu/drm/i915/gt/intel_gtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.c
@@ -132,14 +132,20 @@ void clear_pages(struct i915_vma *vma)
memset(&vma->page_sizes, 0, sizeof(vma->page_sizes));
}
-void * __px_vaddr(struct drm_i915_gem_object *p)
+void * __px_vaddr(struct drm_i915_gem_object *p, bool *needs_flush)
{
enum i915_map_type type;
+ void *vaddr;
GEM_BUG_ON(!i915_gem_object_has_pages(p));
GEM_BUG_ON(!p->mm.mapping);
- return page_unpack_bits(p->mm.mapping, &type);
+ vaddr = page_unpack_bits(p->mm.mapping, &type);
+
+ if (needs_flush)
+ *needs_flush = type != I915_MAP_WC;
+
+ return vaddr;
}
dma_addr_t __px_dma(struct drm_i915_gem_object *p)
@@ -151,16 +157,18 @@ dma_addr_t __px_dma(struct drm_i915_gem_object *p)
void
fill_page_dma(struct drm_i915_gem_object *p, const u64 val, unsigned int count)
{
+ bool needs_flush;
void *vaddr;
- vaddr = __px_vaddr(p);
+ vaddr = __px_vaddr(p, &needs_flush);
memset64(vaddr, val, count);
- clflush_cache_range(vaddr, PAGE_SIZE);
+ if (needs_flush)
+ clflush_cache_range(vaddr, PAGE_SIZE);
}
static void poison_scratch_page(struct drm_i915_gem_object *scratch)
{
- void *vaddr = __px_vaddr(scratch);
+ void *vaddr = __px_vaddr(scratch, NULL);
u8 val;
val = 0;
diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h
index aebc363054c7..34b1f50400cd 100644
--- a/drivers/gpu/drm/i915/gt/intel_gtt.h
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.h
@@ -175,8 +175,8 @@ struct i915_page_directory {
dma_addr_t __px_dma(struct drm_i915_gem_object *p);
#define px_dma(px) (__px_dma(px_base(px)))
-void * __px_vaddr(struct drm_i915_gem_object *p);
-#define px_vaddr(px) (__px_vaddr(px_base(px)))
+void * __px_vaddr(struct drm_i915_gem_object *p, bool *needs_flush);
+#define px_vaddr(px, needs_flush) (__px_vaddr(px_base(px), needs_flush))
#define px_pt(px) \
__px_choose_expr(px, struct i915_page_table *, __x, \
diff --git a/drivers/gpu/drm/i915/gt/intel_ppgtt.c b/drivers/gpu/drm/i915/gt/intel_ppgtt.c
index 77ad8ecee648..6a1d1c3da8f1 100644
--- a/drivers/gpu/drm/i915/gt/intel_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ppgtt.c
@@ -68,10 +68,12 @@ write_dma_entry(struct drm_i915_gem_object * const pdma,
const unsigned short idx,
const u64 encoded_entry)
{
- u64 * const vaddr = __px_vaddr(pdma);
+ bool needs_flush;
+ u64 * const vaddr = __px_vaddr(pdma, &needs_flush);
vaddr[idx] = encoded_entry;
- clflush_cache_range(&vaddr[idx], sizeof(u64));
+ if (needs_flush)
+ clflush_cache_range(&vaddr[idx], sizeof(u64));
}
void
diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index 6a7abb3e2bb5..6698750ffe8d 100644
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -307,7 +307,7 @@ static int live_noa_gpr(void *arg)
}
/* Poison the ce->vm so we detect writes not to the GGTT gt->scratch */
- scratch = __px_vaddr(ce->vm->scratch[0]);
+ scratch = __px_vaddr(ce->vm->scratch[0], NULL);
memset(scratch, POISON_FREE, PAGE_SIZE);
rq = intel_context_create_request(ce);
--
2.26.2
More information about the Intel-gfx-trybot
mailing list