|
@@ -453,16 +453,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
|
|
|
err_printf(m, "%s --- HW Context = 0x%08x\n",
|
|
|
dev_priv->ring[i].name,
|
|
|
obj->gtt_offset);
|
|
|
- offset = 0;
|
|
|
- for (elt = 0; elt < PAGE_SIZE/16; elt += 4) {
|
|
|
- err_printf(m, "[%04x] %08x %08x %08x %08x\n",
|
|
|
- offset,
|
|
|
- obj->pages[0][elt],
|
|
|
- obj->pages[0][elt+1],
|
|
|
- obj->pages[0][elt+2],
|
|
|
- obj->pages[0][elt+3]);
|
|
|
- offset += 16;
|
|
|
- }
|
|
|
+ print_error_obj(m, obj);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -878,10 +869,7 @@ static void i915_gem_record_active_context(struct intel_ring_buffer *ring,
|
|
|
|
|
|
list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
|
|
|
if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) {
|
|
|
- ering->ctx = i915_error_object_create_sized(dev_priv,
|
|
|
- obj,
|
|
|
- &dev_priv->gtt.base,
|
|
|
- 1);
|
|
|
+ ering->ctx = i915_error_ggtt_object_create(dev_priv, obj);
|
|
|
break;
|
|
|
}
|
|
|
}
|