[PATCH 03/38] drm/i915: fix handling gen8_emit_flush_coherentl3_wa result

[Jani Nikula]

On Mon, 21 Sep 2015, Andrzej Hajda <a.hajda at samsung.com> wrote:
> The function can return negative value.
>
> The problem has been detected using proposed semantic patch
> scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci [1].
>
> [1]: http://permalink.gmane.org/gmane.linux.kernel/2038576
>
> Signed-off-by: Andrzej Hajda <a.hajda at samsung.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> ---
>  drivers/gpu/drm/i915/intel_lrc.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index fe06accb0..ff9a481 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1254,9 +1254,10 @@ static int gen8_init_indirectctx_bb(struct intel_engine_cs *ring,
>  
>  	/* WaFlushCoherentL3CacheLinesAtContextSwitch:bdw */
>  	if (IS_BROADWELL(ring->dev)) {
> -		index = gen8_emit_flush_coherentl3_wa(ring, batch, index);
> -		if (index < 0)
> -			return index;
> +		int rc = gen8_emit_flush_coherentl3_wa(ring, batch, index);
> +		if (rc < 0)
> +			return rc;
> +		index = rc;
>  	}
>  
>  	/* WaClearSlmSpaceAtContextSwitch:bdw,chv */
> -- 
> 1.9.1
>

-- 
Jani Nikula, Intel Open Source Technology Center