diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-02 15:12:41 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-02 15:12:41 +0100 |
| commit | 1cdf7fef793c715d8c4998575aba3741fa4a0b01 (patch) | |
| tree | 00648292c523c4098567aa605cecdcf44cddc128 | |
| parent | drm/i915: If the GPU hangs twice within 5 seconds, declare it wedged. (diff) | |
| download | wireguard-linux-1cdf7fef793c715d8c4998575aba3741fa4a0b01.tar.xz wireguard-linux-1cdf7fef793c715d8c4998575aba3741fa4a0b01.zip | |
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>
| -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, 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 |