[Intel-gfx] [PATCH] drm/i915/lrc: Remove superfluous WARN_ON

[Tvrtko Ursulin]

On 26/01/2018 09:35, Chris Wilson wrote:
> Remove the WARN_ON(ce->state) inside the static function only called
> when ce->state == NULL and downgrade the w/a batch setup warning into a
> developer only mode (GEM_WARN_ON).
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_lrc.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 1a3174371c8e..50b37bf3682a 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1419,7 +1419,8 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
>   	 */
>   	for (i = 0; i < ARRAY_SIZE(wa_bb_fn); i++) {
>   		wa_bb[i]->offset = batch_ptr - batch;
> -		if (WARN_ON(!IS_ALIGNED(wa_bb[i]->offset, CACHELINE_BYTES))) {
> +		if (GEM_WARN_ON(!IS_ALIGNED(wa_bb[i]->offset,
> +					    CACHELINE_BYTES))) {
>   			ret = -EINVAL;
>   			break;
>   		}
> @@ -2271,8 +2272,6 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
>   	struct intel_ring *ring;
>   	int ret;
>   
> -	WARN_ON(ce->state);
> -

Call path is a bit messy, maybe this would be better left as 
GEM_WARN_ON, return -Esomething?

Regards,

Tvrtko

>   	context_size = round_up(engine->context_size, I915_GTT_PAGE_SIZE);
>   
>   	/*
>