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

Commit f1acec93 authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

drm/i915: Don't print to dmesg when taking signal during object_pin. 



This showed up in logs where people had a hung chip, so pinning was blocked
on the chip unpinning other buffers, and the X Server took its scheduler
signal during that time.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 3c4fdcfb

drivers/gpu/drm/i915/i915_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -2491,6 +2491,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, 


		/* error other than GTT full, or we've already tried again */

		if (ret != -ENOMEM || pin_tries >= 1) {

			if (ret != -ERESTARTSYS)

				DRM_ERROR("Failed to pin buffers %d\n", ret);

			goto err;

		}
@@ -2641,6 +2642,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) 
	if (obj_priv->gtt_space == NULL) {

		ret = i915_gem_object_bind_to_gtt(obj, alignment);

		if (ret != 0) {

			if (ret != -ERESTARTSYS)

				DRM_ERROR("Failure to bind: %d", ret);

			return ret;

		}