[Intel-gfx] [PATCH 58/59] drm/i915: Remove the now obsolete 'i915_gem_check_olr()'

[Tomas Elf]

On 19/03/2015 12:31, John.C.Harrison at Intel.com wrote:
> From: John Harrison <John.C.Harrison at Intel.com>
>
> As there is no OLR to check, the check_olr() function is now a no-op and can be
> removed.
>
> For: VIZ-5115
> Signed-off-by: John Harrison <John.C.Harrison at Intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.h |    1 -
>   drivers/gpu/drm/i915/i915_gem.c |   28 ----------------------------
>   2 files changed, 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 764ee4f..0a68dbc 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2713,7 +2713,6 @@ bool i915_gem_retire_requests(struct drm_device *dev);
>   void i915_gem_retire_requests_ring(struct intel_engine_cs *ring);
>   int __must_check i915_gem_check_wedge(struct i915_gpu_error *error,
>   				      bool interruptible);
> -int __must_check i915_gem_check_olr(struct drm_i915_gem_request *req);
>
>   static inline bool i915_reset_in_progress(struct i915_gpu_error *error)
>   {
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index ecdae34..acb824c 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1153,17 +1153,6 @@ i915_gem_check_wedge(struct i915_gpu_error *error,
>   	return 0;
>   }
>
> -/*
> - * Compare arbitrary request against outstanding lazy request. Emit on match.
> - */
> -int
> -i915_gem_check_olr(struct drm_i915_gem_request *req)
> -{
> -	WARN_ON(!mutex_is_locked(&req->ring->dev->struct_mutex));
> -
> -	return 0;
> -}
> -
>   static void fake_irq(unsigned long data)
>   {
>   	wake_up_process((struct task_struct *)data);
> @@ -1338,10 +1327,6 @@ i915_wait_request(struct drm_i915_gem_request *req)
>   	if (ret)
>   		return ret;
>
> -	ret = i915_gem_check_olr(req);
> -	if (ret)
> -		return ret;
> -
>   	reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
>   	i915_gem_request_reference(req);
>   	ret = __i915_wait_request(req, reset_counter,
> @@ -1415,10 +1400,6 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj,
>   	if (ret)
>   		return ret;
>
> -	ret = i915_gem_check_olr(req);
> -	if (ret)
> -		return ret;
> -
>   	reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
>   	i915_gem_request_reference(req);
>   	mutex_unlock(&dev->struct_mutex);
> @@ -2852,15 +2833,10 @@ static int
>   i915_gem_object_flush_active(struct drm_i915_gem_object *obj)
>   {
>   	struct intel_engine_cs *ring;
> -	int ret;
>
>   	if (obj->active) {
>   		ring = i915_gem_request_get_ring(obj->last_read_req);
>
> -		ret = i915_gem_check_olr(obj->last_read_req);
> -		if (ret)
> -			return ret;
> -
>   		i915_gem_retire_requests_ring(ring);
>   	}
>
> @@ -2997,10 +2973,6 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj,
>   			return ret;
>   	}
>
> -	ret = i915_gem_check_olr(obj->last_read_req);
> -	if (ret)
> -		return ret;
> -
>   	trace_i915_gem_ring_sync_to(*to_req, from, obj->last_read_req);
>   	ret = to->semaphore.sync_to(*to_req, from, seqno);
>   	if (!ret)
>

Reviewed-by: Tomas Elf <tomas.elf at intel.com>

Thanks,
Tomas