Skip to content

Commit

Permalink
drm/i915: Augment i915 error state to include the dump of GuC log buffer
Browse files Browse the repository at this point in the history
Added the dump of GuC log buffer to i915 error state, as the contents of
GuC log buffer would also be useful to determine that why the GPU reset
was triggered.

v2:
- For uniformity use existing helper function print_error_obj() to
  dump out contents of GuC log buffer, pretty printing is better left
  to userspace. (Chris)
- Skip the dumping of GuC log buffer when logging is disabled as it
  won't be of any use.
- Rebase.

v3: Rebase.

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
  • Loading branch information
Akash Goel authored and Tvrtko Ursulin committed Oct 25, 2016
1 parent 72c0bc6 commit 27b85be
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,7 @@ struct drm_i915_error_state {
struct intel_overlay_error_state *overlay;
struct intel_display_error_state *display;
struct drm_i915_error_object *semaphore;
struct drm_i915_error_object *guc_log;

struct drm_i915_error_engine {
int engine_id;
Expand Down
15 changes: 15 additions & 0 deletions drivers/gpu/drm/i915/i915_gpu_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,

print_error_obj(m, NULL, "Semaphores", error->semaphore);

print_error_obj(m, NULL, "GuC log buffer", error->guc_log);

if (error->overlay)
intel_overlay_print_error_state(m, error->overlay);

Expand Down Expand Up @@ -782,6 +784,7 @@ static void i915_error_state_free(struct kref *error_ref)
}

i915_error_object_free(error->semaphore);
i915_error_object_free(error->guc_log);

for (i = 0; i < ARRAY_SIZE(error->active_bo); i++)
kfree(error->active_bo[i]);
Expand Down Expand Up @@ -1408,6 +1411,17 @@ static void i915_capture_pinned_buffers(struct drm_i915_private *dev_priv,
error->pinned_bo = bo;
}

static void i915_gem_capture_guc_log_buffer(struct drm_i915_private *dev_priv,
struct drm_i915_error_state *error)
{
/* Capturing log buf contents won't be useful if logging was disabled */
if (!dev_priv->guc.log.vma || (i915.guc_log_level < 0))
return;

error->guc_log = i915_error_object_create(dev_priv,
dev_priv->guc.log.vma);
}

/* Capture all registers which don't fit into another category. */
static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
struct drm_i915_error_state *error)
Expand Down Expand Up @@ -1532,6 +1546,7 @@ static int capture(void *data)
i915_gem_record_rings(error->i915, error);
i915_capture_active_buffers(error->i915, error);
i915_capture_pinned_buffers(error->i915, error);
i915_gem_capture_guc_log_buffer(error->i915, error);

do_gettimeofday(&error->time);

Expand Down

0 comments on commit 27b85be

Please sign in to comment.