Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7b91078 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Add vm to error BO capture 



formerly: drm/i915: Create VMAs (part 6) - finish error plumbing

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent feb822cf

drivers/gpu/drm/i915/i915_gpu_error.c

+14 −7
Original line number Original line Diff line number Diff line
@@ -482,6 +482,7 @@ static void i915_error_state_free(struct kref *error_ref) 
static struct drm_i915_error_object *

static struct drm_i915_error_object *

i915_error_object_create_sized(struct drm_i915_private *dev_priv,

i915_error_object_create_sized(struct drm_i915_private *dev_priv,

			       struct drm_i915_gem_object *src,

			       struct drm_i915_gem_object *src,

			       struct i915_address_space *vm,

			       const int num_pages)

			       const int num_pages)

{

{

	struct drm_i915_error_object *dst;

	struct drm_i915_error_object *dst;
@@ -495,7 +496,7 @@ i915_error_object_create_sized(struct drm_i915_private *dev_priv, 
	if (dst == NULL)

	if (dst == NULL)

		return NULL;

		return NULL;





	reloc_offset = dst->gtt_offset = i915_gem_obj_ggtt_offset(src);

	reloc_offset = dst->gtt_offset = i915_gem_obj_offset(src, vm);

	for (i = 0; i < num_pages; i++) {

	for (i = 0; i < num_pages; i++) {

		unsigned long flags;

		unsigned long flags;

		void *d;

		void *d;
@@ -556,8 +557,12 @@ i915_error_object_create_sized(struct drm_i915_private *dev_priv, 
	kfree(dst);

	kfree(dst);

	return NULL;

	return NULL;

}

}

#define i915_error_object_create(dev_priv, src) \

#define i915_error_object_create(dev_priv, src, vm) \

	i915_error_object_create_sized((dev_priv), (src), \

	i915_error_object_create_sized((dev_priv), (src), (vm), \

				       (src)->base.size>>PAGE_SHIFT)



#define i915_error_ggtt_object_create(dev_priv, src) \

	i915_error_object_create_sized((dev_priv), (src), &(dev_priv)->gtt.base, \

				       (src)->base.size>>PAGE_SHIFT)

				       (src)->base.size>>PAGE_SHIFT)





static void capture_bo(struct drm_i915_error_buffer *err,

static void capture_bo(struct drm_i915_error_buffer *err,
@@ -670,7 +675,7 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, 
		obj = ring->scratch.obj;

		obj = ring->scratch.obj;

		if (acthd >= i915_gem_obj_ggtt_offset(obj) &&

		if (acthd >= i915_gem_obj_ggtt_offset(obj) &&

		    acthd < i915_gem_obj_ggtt_offset(obj) + obj->base.size)

		    acthd < i915_gem_obj_ggtt_offset(obj) + obj->base.size)

			return i915_error_object_create(dev_priv, obj);

			return i915_error_ggtt_object_create(dev_priv, obj);

	}

	}





	seqno = ring->get_seqno(ring, false);

	seqno = ring->get_seqno(ring, false);
@@ -689,7 +694,7 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, 
			/* We need to copy these to an anonymous buffer as the simplest

			/* We need to copy these to an anonymous buffer as the simplest

			 * method to avoid being overwritten by userspace.

			 * method to avoid being overwritten by userspace.

			 */

			 */

			return i915_error_object_create(dev_priv, obj);

			return i915_error_object_create(dev_priv, obj, vm);

		}

		}

	}

	}
@@ -765,7 +770,9 @@ static void i915_gem_record_active_context(struct intel_ring_buffer *ring, 
	list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {

	list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {

		if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) {

		if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) {

			ering->ctx = i915_error_object_create_sized(dev_priv,

			ering->ctx = i915_error_object_create_sized(dev_priv,

								    obj, 1);

								    obj,

								    &dev_priv->gtt.base,

								    1);

			break;

			break;

		}

		}

	}

	}
@@ -786,7 +793,7 @@ static void i915_gem_record_rings(struct drm_device *dev, 
			i915_error_first_batchbuffer(dev_priv, ring);

			i915_error_first_batchbuffer(dev_priv, ring);





		error->ring[i].ringbuffer =

		error->ring[i].ringbuffer =

			i915_error_object_create(dev_priv, ring->obj);

			i915_error_ggtt_object_create(dev_priv, ring->obj);









		i915_gem_record_active_context(ring, error, &error->ring[i]);

		i915_gem_record_active_context(ring, error, &error->ring[i]);