Commit 5ece208a authored by Chris Wilson's avatar Chris Wilson Committed by John Harrison

drm/i915/guc: Use streaming loads to speed up dumping the guc log

Use a temporary page and mempy_from_wc to reduce the time it takes to
dump the guc log to debugfs.
Signed-off-by: default avatarChris Wilson <chris.p.wilson@intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarAlan Previn <alan.previn.teres.alexis@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220728022028.2190627-6-John.C.Harrison@Intel.com
parent c5de70f6
...@@ -750,8 +750,9 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p, ...@@ -750,8 +750,9 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p,
struct intel_guc *guc = log_to_guc(log); struct intel_guc *guc = log_to_guc(log);
struct intel_uc *uc = container_of(guc, struct intel_uc, guc); struct intel_uc *uc = container_of(guc, struct intel_uc, guc);
struct drm_i915_gem_object *obj = NULL; struct drm_i915_gem_object *obj = NULL;
u32 *map; void *map;
int i = 0; u32 *page;
int i, j;
if (!intel_guc_is_supported(guc)) if (!intel_guc_is_supported(guc))
return -ENODEV; return -ENODEV;
...@@ -764,23 +765,34 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p, ...@@ -764,23 +765,34 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p,
if (!obj) if (!obj)
return 0; return 0;
page = (u32 *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
intel_guc_dump_time_info(guc, p); intel_guc_dump_time_info(guc, p);
map = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC); map = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);
if (IS_ERR(map)) { if (IS_ERR(map)) {
DRM_DEBUG("Failed to pin object\n"); DRM_DEBUG("Failed to pin object\n");
drm_puts(p, "(log data unaccessible)\n"); drm_puts(p, "(log data unaccessible)\n");
free_page((unsigned long)page);
return PTR_ERR(map); return PTR_ERR(map);
} }
for (i = 0; i < obj->base.size / sizeof(u32); i += 4) for (i = 0; i < obj->base.size; i += PAGE_SIZE) {
drm_printf(p, "0x%08x 0x%08x 0x%08x 0x%08x\n", if (!i915_memcpy_from_wc(page, map + i, PAGE_SIZE))
*(map + i), *(map + i + 1), memcpy(page, map + i, PAGE_SIZE);
*(map + i + 2), *(map + i + 3));
for (j = 0; j < PAGE_SIZE / sizeof(u32); j += 4)
drm_printf(p, "0x%08x 0x%08x 0x%08x 0x%08x\n",
*(page + j + 0), *(page + j + 1),
*(page + j + 2), *(page + j + 3));
}
drm_puts(p, "\n"); drm_puts(p, "\n");
i915_gem_object_unpin_map(obj); i915_gem_object_unpin_map(obj);
free_page((unsigned long)page);
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment