Merge tag 'drm-intel-gt-next-2022-08-24' of git://anongit.freedesktop.org/drm/drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gt / uc / intel_guc_log.c

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
index 25b2d7ce6640d8c3fa0e5dceee924c4091d32f19..4722d4b18ed196c86c46da79b428d0eb5162aeab 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
@@ -15,6 +15,32 @@
 
 static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log);
 
+static u32 intel_guc_log_size(struct intel_guc_log *log)
+{
+       /*
+        *  GuC Log buffer Layout:
+        *
+        *  NB: Ordering must follow "enum guc_log_buffer_type".
+        *
+        *  +===============================+ 00B
+        *  |      Debug state header       |
+        *  +-------------------------------+ 32B
+        *  |    Crash dump state header    |
+        *  +-------------------------------+ 64B
+        *  |     Capture state header      |
+        *  +-------------------------------+ 96B
+        *  |                               |
+        *  +===============================+ PAGE_SIZE (4KB)
+        *  |          Debug logs           |
+        *  +===============================+ + DEBUG_SIZE
+        *  |        Crash Dump logs        |
+        *  +===============================+ + CRASH_SIZE
+        *  |         Capture logs          |
+        *  +===============================+ + CAPTURE_SIZE
+        */
+       return PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE + CAPTURE_BUFFER_SIZE;
+}
+
 /**
  * DOC: GuC firmware log
  *
@@ -461,32 +487,7 @@ int intel_guc_log_create(struct intel_guc_log *log)
 
        GEM_BUG_ON(log->vma);
 
-       /*
-        *  GuC Log buffer Layout
-        * (this ordering must follow "enum guc_log_buffer_type" definition)
-        *
-        *  +===============================+ 00B
-        *  |      Debug state header       |
-        *  +-------------------------------+ 32B
-        *  |    Crash dump state header    |
-        *  +-------------------------------+ 64B
-        *  |     Capture state header      |
-        *  +-------------------------------+ 96B
-        *  |                               |
-        *  +===============================+ PAGE_SIZE (4KB)
-        *  |          Debug logs           |
-        *  +===============================+ + DEBUG_SIZE
-        *  |        Crash Dump logs        |
-        *  +===============================+ + CRASH_SIZE
-        *  |         Capture logs          |
-        *  +===============================+ + CAPTURE_SIZE
-        */
-       if (intel_guc_capture_output_min_size_est(guc) > CAPTURE_BUFFER_SIZE)
-               DRM_WARN("GuC log buffer for state_capture maybe too small. %d < %d\n",
-                        CAPTURE_BUFFER_SIZE, intel_guc_capture_output_min_size_est(guc));
-
-       guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE +
-                      CAPTURE_BUFFER_SIZE;
+       guc_log_size = intel_guc_log_size(log);
 
        vma = intel_guc_allocate_vma(guc, guc_log_size);
        if (IS_ERR(vma)) {
@@ -749,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_uc *uc = container_of(guc, struct intel_uc, guc);
        struct drm_i915_gem_object *obj = NULL;
-       u32 *map;
-       int i = 0;
+       void *map;
+       u32 *page;
+       int i, j;
 
        if (!intel_guc_is_supported(guc))
                return -ENODEV;
@@ -763,21 +765,34 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p,
        if (!obj)
                return 0;
 
+       page = (u32 *)__get_free_page(GFP_KERNEL);
+       if (!page)
+               return -ENOMEM;
+
+       intel_guc_dump_time_info(guc, p);
+
        map = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);
        if (IS_ERR(map)) {
                DRM_DEBUG("Failed to pin object\n");
                drm_puts(p, "(log data unaccessible)\n");
+               free_page((unsigned long)page);
                return PTR_ERR(map);
        }
 
-       for (i = 0; i < obj->base.size / sizeof(u32); i += 4)
-               drm_printf(p, "0x%08x 0x%08x 0x%08x 0x%08x\n",
-                          *(map + i), *(map + i + 1),
-                          *(map + i + 2), *(map + i + 3));
+       for (i = 0; i < obj->base.size; i += PAGE_SIZE) {
+               if (!i915_memcpy_from_wc(page, map + i, PAGE_SIZE))
+                       memcpy(page, map + i, PAGE_SIZE);
+
+               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");
 
        i915_gem_object_unpin_map(obj);
+       free_page((unsigned long)page);
 
        return 0;
 }