[Intel-gfx] [PATCH] drm/i915: fix up the relocate_entry refactoring

[Daniel Vetter]

On Mon, Sep 02, 2013 at 08:58:03PM +0200, Daniel Vetter wrote:
> 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 at 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.

I've smashed the patch onto dinq meanwhile.
-Daniel

> 
> Cc: Rafael Barbalho <rafael.barbalho at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index ea4bacb..e519f9f 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -349,6 +349,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;
>  
> -- 
> 1.8.4.rc3
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch