diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-02 10:12:41 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-02 10:12:41 -0400 |
commit | 1cdf7fef793c715d8c4998575aba3741fa4a0b01 (patch) | |
tree | 00648292c523c4098567aa605cecdcf44cddc128 /drivers/gpu/drm/i915 | |
parent | ae681d969ac0946e09636f2bef7a126d73e1ad6b (diff) |
drm/i915: Don't mask the return code whilst relocating.
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index db9d36fb5883..a78c97340605 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -3454,7 +3454,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
3454 | if (ret != 0) { | 3454 | if (ret != 0) { |
3455 | drm_gem_object_unreference(target_obj); | 3455 | drm_gem_object_unreference(target_obj); |
3456 | i915_gem_object_unpin(obj); | 3456 | i915_gem_object_unpin(obj); |
3457 | return -EINVAL; | 3457 | return ret; |
3458 | } | 3458 | } |
3459 | 3459 | ||
3460 | /* Map the page containing the relocation we're going to | 3460 | /* Map the page containing the relocation we're going to |