Skip to contentSkip to conversation

drm/i915: Log correct start and length in pte map trace

PATCH In review Michel Thierry 2 participants 2 messages Oct 13, 2015 – Oct 14, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Log correct start and length in pte map trace

The PTE_map trace added in commit 4c06ec8d13d2 ("drm/i915/gen8: Add dynamic page trace events") was using the full start and length values, instead of the page directory ones.

Since this is just a trace, I don't think it requires cc'ing stable.

---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
index e81990d..642fe87 100644
@@ -1305,8 +1305,8 @@ static int gen8_alloc_va_range_3lvl(struct i915_address_space *vm,
 			page_directory[pde] = gen8_pde_encode(px_dma(pt),
 							      I915_CACHE_LLC);
 			trace_i915_page_table_entry_map(&ppgtt->base, pde, pt,
-							gen8_pte_index(start),
-							gen8_pte_count(start, length),
+							gen8_pte_index(pd_start),
+							gen8_pte_count(pd_start, pd_len),
 							GEN8_PTES);
 
 			/* NB: We haven't yet mapped ptes to pages. At this
Signature · 6 lines
2.6.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#1 lore raw
Quoted 5 lines · Michel Thierry

The PTE_map trace added in commit 4c06ec8d13d2 ("drm/i915/gen8: Add dynamic page trace events") was using the full start and length values, instead of the page directory ones.

Since this is just a trace, I don't think it requires cc'ing stable.

Especially not since 4c06ec8d13d2 is not even in Linus' tree yet.

BR,
Jani.

Quoted 29 lines
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -2
index e81990d..642fe87 100644
@@ -1305,8 +1305,8 @@ static int gen8_alloc_va_range_3lvl(struct i915_address_space *vm,
 			page_directory[pde] = gen8_pde_encode(px_dma(pt),
 							      I915_CACHE_LLC);
 			trace_i915_page_table_entry_map(&ppgtt->base, pde, pt,
-							gen8_pte_index(start),
-							gen8_pte_count(start, length),
+							gen8_pte_index(pd_start),
+							gen8_pte_count(pd_start, pd_len),
 							GEN8_PTES);
 
 			/* NB: We haven't yet mapped ptes to pages. At this
Signature · 6 lines
2.6.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx