aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 6a288a758385..630eec21b373 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2491,7 +2491,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
2491 2491
2492 /* error other than GTT full, or we've already tried again */ 2492 /* error other than GTT full, or we've already tried again */
2493 if (ret != -ENOMEM || pin_tries >= 1) { 2493 if (ret != -ENOMEM || pin_tries >= 1) {
2494 DRM_ERROR("Failed to pin buffers %d\n", ret); 2494 if (ret != -ERESTARTSYS)
2495 DRM_ERROR("Failed to pin buffers %d\n", ret);
2495 goto err; 2496 goto err;
2496 } 2497 }
2497 2498
@@ -2641,7 +2642,8 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
2641 if (obj_priv->gtt_space == NULL) { 2642 if (obj_priv->gtt_space == NULL) {
2642 ret = i915_gem_object_bind_to_gtt(obj, alignment); 2643 ret = i915_gem_object_bind_to_gtt(obj, alignment);
2643 if (ret != 0) { 2644 if (ret != 0) {
2644 DRM_ERROR("Failure to bind: %d", ret); 2645 if (ret != -ERESTARTSYS)
2646 DRM_ERROR("Failure to bind: %d", ret);
2645 return ret; 2647 return ret;
2646 } 2648 }
2647 } 2649 }