On Fri, Jul 15, 2016 at 12:08:05PM +0100, Chris Wilson wrote: > On Fri, Jul 15, 2016 at 01:47:34PM +0300, Joonas Lahtinen wrote: > > On pe, 2016-07-15 at 11:11 +0100, Chris Wilson wrote: > > > +#define NO_WAITBOOST ERR_PTR(-1) > > > > This does not seem to be a very common idiom in kernel, just add flags > > maybe. > > I find the special values for the client (including the existing NULL > client) much more informative. Is it more pleasant with...? diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index bfec4a88707d..aedc15d46463 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -713,7 +713,7 @@ complete: *timeout = 0; } - if (!IS_ERR_OR_NULL(rps) && + if (IS_RPS_CLIENT(rps) && req->fence.seqno == req->engine->last_submitted_seqno) { /* The GPU is now idle and this client has stalled. * Since no other client has submitted a request in the diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h index f7f497a07893..b3fe80d4eb63 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.h +++ b/drivers/gpu/drm/i915/i915_gem_request.h @@ -207,6 +207,7 @@ void __i915_add_request(struct drm_i915_gem_request *req, struct intel_rps_client; #define NO_WAITBOOST ERR_PTR(-1) +#define IS_RPS_CLIENT(p) (!IS_ERR_OR_NULL(p)) -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx