diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-02 20:56:23 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-03 19:18:01 +0200 |
| commit | d4d36014ca37e6fa8271b0690e678b76456faa01 (patch) | |
| tree | f01475f0aa596373bb46384c64202f5cf851a07c /drivers | |
| parent | 4c6df4b4ca1b26f4532d403b544f649a1c801fd1 (diff) | |
| download | linux-d4d36014ca37e6fa8271b0690e678b76456faa01.tar.gz linux-d4d36014ca37e6fa8271b0690e678b76456faa01.tar.bz2 linux-d4d36014ca37e6fa8271b0690e678b76456faa01.zip | |
drm/i915: fix up the relocate_entry refactoring
Somehow we've lost the error handling in the patch split-up between
the internal and external patch. This regression has been introduced
in
commit 5032d871f7d300aee10c309ea004eb4f851553fe
Author: Rafael Barbalho <rafael.barbalho@intel.com>
Date: Wed Aug 21 17:10:51 2013 +0100
drm/i915: Cleaning up the relocate entry function
This bug is exercised by igt/gem_reloc_vs_gpu/interruptible.
Cc: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 792c52a235ee..bf345777ae9f 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -310,6 +310,9 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, else ret = relocate_entry_gtt(obj, reloc); + if (ret) + return ret; + /* and update the user's relocation entry */ reloc->presumed_offset = target_offset; |