xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Merge i915_request.flags with i915_request.fence.flags

Browse Source 
As we already have a flags field buried within i915_request, reuse it!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200106114234.2529613-3-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2020-01-06 11:42:31 +00:00
parent 6d728d92d8
commit e1c31fb5dd
7 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/gpu/drm/i915/i915_request.h
View File

@@ -77,6 +77,38 @@ enum {
* a request is on the various signal_list.
*/
I915_FENCE_FLAG_SIGNAL,
/*
* I915_FENCE_FLAG_NOPREEMPT - this request should not be preempted
*
* The execution of some requests should not be interrupted. This is
* a sensitive operation as it makes the request super important,
* blocking other higher priority work. Abuse of this flag will
* lead to quality of service issues.
*/
I915_FENCE_FLAG_NOPREEMPT,
/*
* I915_FENCE_FLAG_SENTINEL - this request should be last in the queue
*
* A high priority sentinel request may be submitted to clear the
* submission queue. As it will be the only request in-flight, upon
* execution all other active requests will have been preempted and
* unsubmitted. This preemptive pulse is used to re-evaluate the
* in-flight requests, particularly in cases where an active context
* is banned and those active requests need to be cancelled.
*/
I915_FENCE_FLAG_SENTINEL,
/*
* I915_FENCE_FLAG_BOOST - upclock the gpu for this request
*
* Some requests are more important than others! In particular, a
* request that the user is waiting on is typically required for
* interactive latency, for which we want to minimise by upclocking
* the GPU. Here we track such boost requests on a per-request basis.
*/
I915_FENCE_FLAG_BOOST,
};
/**
@@ -225,11 +257,6 @@ struct i915_request {
/** Time at which this request was emitted, in jiffies. */
unsigned long emitted_jiffies;
unsigned long flags;
#define I915_REQUEST_WAITBOOST BIT(0)
#define I915_REQUEST_NOPREEMPT BIT(1)
#define I915_REQUEST_SENTINEL BIT(2)
/** timeline->request entry for this request */
struct list_head link;
@@ -442,18 +469,18 @@ static inline void i915_request_mark_complete(struct i915_request *rq)
static inline bool i915_request_has_waitboost(const struct i915_request *rq)
{
return rq->flags & I915_REQUEST_WAITBOOST;
return test_bit(I915_FENCE_FLAG_BOOST, &rq->fence.flags);
}
static inline bool i915_request_has_nopreempt(const struct i915_request *rq)
{
/* Preemption should only be disabled very rarely */
return unlikely(rq->flags & I915_REQUEST_NOPREEMPT);
return unlikely(test_bit(I915_FENCE_FLAG_NOPREEMPT, &rq->fence.flags));
}
static inline bool i915_request_has_sentinel(const struct i915_request *rq)
{
return unlikely(rq->flags & I915_REQUEST_SENTINEL);
return unlikely(test_bit(I915_FENCE_FLAG_SENTINEL, &rq->fence.flags));
}
static inline struct intel_timeline *