aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gpu_error.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index df524c9cad40..8c81cf3aa182 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -335,21 +335,16 @@ static void print_error_buffers(struct drm_i915_error_state_buf *m,
335 struct drm_i915_error_buffer *err, 335 struct drm_i915_error_buffer *err,
336 int count) 336 int count)
337{ 337{
338 int i;
339
340 err_printf(m, "%s [%d]:\n", name, count); 338 err_printf(m, "%s [%d]:\n", name, count);
341 339
342 while (count--) { 340 while (count--) {
343 err_printf(m, " %08x_%08x %8u %02x %02x [ ", 341 err_printf(m, " %08x_%08x %8u %02x %02x %02x",
344 upper_32_bits(err->gtt_offset), 342 upper_32_bits(err->gtt_offset),
345 lower_32_bits(err->gtt_offset), 343 lower_32_bits(err->gtt_offset),
346 err->size, 344 err->size,
347 err->read_domains, 345 err->read_domains,
348 err->write_domain); 346 err->write_domain,
349 for (i = 0; i < I915_NUM_ENGINES; i++) 347 err->wseqno);
350 err_printf(m, "%02x ", err->rseqno[i]);
351
352 err_printf(m, "] %02x", err->wseqno);
353 err_puts(m, tiling_flag(err->tiling)); 348 err_puts(m, tiling_flag(err->tiling));
354 err_puts(m, dirty_flag(err->dirty)); 349 err_puts(m, dirty_flag(err->dirty));
355 err_puts(m, purgeable_flag(err->purgeable)); 350 err_puts(m, purgeable_flag(err->purgeable));
@@ -1021,13 +1016,10 @@ static void capture_bo(struct drm_i915_error_buffer *err,
1021 struct i915_vma *vma) 1016 struct i915_vma *vma)
1022{ 1017{
1023 struct drm_i915_gem_object *obj = vma->obj; 1018 struct drm_i915_gem_object *obj = vma->obj;
1024 int i;
1025 1019
1026 err->size = obj->base.size; 1020 err->size = obj->base.size;
1027 err->name = obj->base.name; 1021 err->name = obj->base.name;
1028 1022
1029 for (i = 0; i < I915_NUM_ENGINES; i++)
1030 err->rseqno[i] = __active_get_seqno(&vma->last_read[i]);
1031 err->wseqno = __active_get_seqno(&obj->frontbuffer_write); 1023 err->wseqno = __active_get_seqno(&obj->frontbuffer_write);
1032 err->engine = __active_get_engine_id(&obj->frontbuffer_write); 1024 err->engine = __active_get_engine_id(&obj->frontbuffer_write);
1033 1025