Re: [RFC 2/4] drm/i915: Removed now redudant parameter to i915_gem_request_completed()

Dave Gordon
2015-04-17T18:57:24Z

On 20/03/15 17:48, John.C.Harrison@Intel.com wrote:
> From: John Harrison <John.C.Harrison@Intel.com>
>
> The change to the implementation of i915_gem_request_completed() means that the
> lazy coherency flag is no longer used. This can now be removed to simplify the
> interface.
>
> For: VIZ-5190
> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
> drivers/gpu/drm/i915/i915_drv.h | 3 +--
> drivers/gpu/drm/i915/i915_gem.c | 14 +++++++-------
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 5 files changed, 11 insertions(+), 12 deletions(-)

Just to bring this up to date, there are three more instances that have
appeared since this patch was written; here are the additional changes:

> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 4dd8b41..f4ba6fe 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -6801,7 +6801,7 @@ static void __intel_rps_boost_work(struct work_struct *work)
> {
> struct request_boost *boost = container_of(work, struct request_boost, work);
>
> - if (!i915_gem_request_completed(boost->rq, true))
> + if (!i915_gem_request_completed(boost->rq))
> gen6_rps_boost(to_i915(boost->rq->ring->dev), NULL);
>
> i915_gem_request_unreference__unlocked(boost->rq);
> dsgordon@dsgordon-linux:/usr2/dsgordon/Source/JH-OTC-DRM/OTC-DRM$ git diff drivers/gpu/drm/i915/i915_gem.c
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 7c97005..9d6b8bf 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1186,7 +1186,7 @@ static int __i915_spin_request(struct drm_i915_gem_request *rq)
>
> timeout = jiffies + 1;
> while (!need_resched()) {
> - if (i915_gem_request_completed(rq, true))
> + if (i915_gem_request_completed(rq))
> return 0;
>
> if (time_after_eq(jiffies, timeout))
> @@ -1194,7 +1194,7 @@ static int __i915_spin_request(struct drm_i915_gem_request *rq)
>
> cpu_relax_lowlatency();
> }
> - if (i915_gem_request_completed(rq, false))
> + if (i915_gem_request_completed(rq))
> return 0;
>
> return -EAGAIN;

.Dave.