| Message ID | 20170928193910.17988-3-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris Wilson <chris@chris-wilson.co.uk> writes: > We use INT_MIN to denote the priority of a request that has not been > submitted to the scheduler; we treat INT_MIN as an invalid priority and > initialise the request to it. Give the value a name so it stands out. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem_request.c | 2 +- > drivers/gpu/drm/i915/i915_gem_request.h | 1 + > drivers/gpu/drm/i915/intel_lrc.c | 4 +++- > 3 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c > index 4eb1a76731b2..14956d899911 100644 > --- a/drivers/gpu/drm/i915/i915_gem_request.c > +++ b/drivers/gpu/drm/i915/i915_gem_request.c > @@ -186,7 +186,7 @@ i915_priotree_init(struct i915_priotree *pt) > INIT_LIST_HEAD(&pt->signalers_list); > INIT_LIST_HEAD(&pt->waiters_list); > INIT_LIST_HEAD(&pt->link); > - pt->priority = INT_MIN; > + pt->priority = I915_PRIORITY_INVALID; > } > > static int reset_all_global_seqno(struct drm_i915_private *i915, u32 seqno) > diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h > index 96eb52471dad..6b9e992d01de 100644 > --- a/drivers/gpu/drm/i915/i915_gem_request.h > +++ b/drivers/gpu/drm/i915/i915_gem_request.h > @@ -72,6 +72,7 @@ struct i915_priotree { > #define I915_PRIORITY_MAX 1024 > #define I915_PRIORITY_NORMAL 0 > #define I915_PRIORITY_MIN (-I915_PRIORITY_MAX) > +#define I915_PRIORITY_INVALID INT_MIN > }; > > struct i915_gem_capture_list { > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index cbac2fff8e4d..303bb2c0b3ce 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -863,6 +863,8 @@ static void execlists_schedule(struct drm_i915_gem_request *request, int prio) > struct i915_dependency stack; > LIST_HEAD(dfs); > > + GEM_BUG_ON(prio == I915_PRIORITY_INVALID); > + > if (prio <= READ_ONCE(request->priotree.priority)) > return; > > @@ -911,7 +913,7 @@ static void execlists_schedule(struct drm_i915_gem_request *request, int prio) > * execlists_submit_request()), we can set our own priority and skip > * acquiring the engine locks. > */ > - if (request->priotree.priority == INT_MIN) { > + if (request->priotree.priority == I915_PRIORITY_INVALID) { > GEM_BUG_ON(!list_empty(&request->priotree.link)); > request->priotree.priority = prio; > if (stack.dfs_link.next == stack.dfs_link.prev) > -- > 2.14.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, 2017-09-28 at 20:39 +0100, Chris Wilson wrote: > We use INT_MIN to denote the priority of a request that has not been > submitted to the scheduler; we treat INT_MIN as an invalid priority and > initialise the request to it. Give the value a name so it stands out. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas
diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index 4eb1a76731b2..14956d899911 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -186,7 +186,7 @@ i915_priotree_init(struct i915_priotree *pt) INIT_LIST_HEAD(&pt->signalers_list); INIT_LIST_HEAD(&pt->waiters_list); INIT_LIST_HEAD(&pt->link); - pt->priority = INT_MIN; + pt->priority = I915_PRIORITY_INVALID; } static int reset_all_global_seqno(struct drm_i915_private *i915, u32 seqno) diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h index 96eb52471dad..6b9e992d01de 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.h +++ b/drivers/gpu/drm/i915/i915_gem_request.h @@ -72,6 +72,7 @@ struct i915_priotree { #define I915_PRIORITY_MAX 1024 #define I915_PRIORITY_NORMAL 0 #define I915_PRIORITY_MIN (-I915_PRIORITY_MAX) +#define I915_PRIORITY_INVALID INT_MIN }; struct i915_gem_capture_list { diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index cbac2fff8e4d..303bb2c0b3ce 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -863,6 +863,8 @@ static void execlists_schedule(struct drm_i915_gem_request *request, int prio) struct i915_dependency stack; LIST_HEAD(dfs); + GEM_BUG_ON(prio == I915_PRIORITY_INVALID); + if (prio <= READ_ONCE(request->priotree.priority)) return; @@ -911,7 +913,7 @@ static void execlists_schedule(struct drm_i915_gem_request *request, int prio) * execlists_submit_request()), we can set our own priority and skip * acquiring the engine locks. */ - if (request->priotree.priority == INT_MIN) { + if (request->priotree.priority == I915_PRIORITY_INVALID) { GEM_BUG_ON(!list_empty(&request->priotree.link)); request->priotree.priority = prio; if (stack.dfs_link.next == stack.dfs_link.prev)
We use INT_MIN to denote the priority of a request that has not been submitted to the scheduler; we treat INT_MIN as an invalid priority and initialise the request to it. Give the value a name so it stands out. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> --- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_gem_request.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-)