drm/i915: Don't mask the return code whilst relocating.
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 2 Oct 2010 14:12:41 +0000 (15:12 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 2 Oct 2010 14:12:41 +0000 (15:12 +0100)
The return from move_to_gtt_domain() may indicate a pending signal which
needs to handled as opposed to an actual error, for instance, so report
the original return value rather than forcing an EINVAL.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_gem.c

index db9d36fb588356400174af9e39cd7351c02d6d69..a78c9734060582c9a393de254178a6d2b0b0edc8 100644 (file)
@@ -3454,7 +3454,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                if (ret != 0) {
                        drm_gem_object_unreference(target_obj);
                        i915_gem_object_unpin(obj);
-                       return -EINVAL;
+                       return ret;
                }
 
                /* Map the page containing the relocation we're going to