drm/i915: Introduce intel_context.pin_mutex for pin management
Introduce a mutex to start locking the HW contexts independently of struct_mutex, with a view to reducing the coarse struct_mutex. The intel_context.pin_mutex is used to guard the transition to and from being pinned on the gpu, and so is required before starting to build any request. The intel_context will then remain pinned until the request completes, but the mutex can be released immediately unpin completion of pinning the context. A slight variant of the above is used by per-context sseu that wants to inspect the pinned status of the context, and requires that it remains stable (either !pinned or pinned) across its operation. By using the pin_mutex to serialise operations while pin_count==0, we can take that pin_mutex for stabilise the boolean pin status. v2: for Tvrtko! * Improved commit message. * Dropped _gpu suffix from gen8_modify_rpcs_gpu. v3: Repair the locking for sseu selftests Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190308132522.21573-7-chris@chris-wilson.co.uk
此提交包含在:
@@ -7,6 +7,8 @@
|
||||
#ifndef __INTEL_CONTEXT_H__
|
||||
#define __INTEL_CONTEXT_H__
|
||||
|
||||
#include <linux/lockdep.h>
|
||||
|
||||
#include "intel_context_types.h"
|
||||
#include "intel_engine_types.h"
|
||||
|
||||
@@ -29,18 +31,30 @@ intel_context_lookup(struct i915_gem_context *ctx,
|
||||
struct intel_engine_cs *engine);
|
||||
|
||||
/**
|
||||
* intel_context_instance - Lookup or allocate the HW context for (ctx, engine)
|
||||
* intel_context_pin_lock - Stablises the 'pinned' status of the HW context
|
||||
* @ctx - the parent GEM context
|
||||
* @engine - the target HW engine
|
||||
*
|
||||
* Returns the existing HW context for this pair of (GEM context, engine), or
|
||||
* allocates and initialises a fresh context. Once allocated, the HW context
|
||||
* remains resident until the GEM context is destroyed.
|
||||
* Acquire a lock on the pinned status of the HW context, such that the context
|
||||
* can neither be bound to the GPU or unbound whilst the lock is held, i.e.
|
||||
* intel_context_is_pinned() remains stable.
|
||||
*/
|
||||
struct intel_context *
|
||||
intel_context_instance(struct i915_gem_context *ctx,
|
||||
intel_context_pin_lock(struct i915_gem_context *ctx,
|
||||
struct intel_engine_cs *engine);
|
||||
|
||||
static inline bool
|
||||
intel_context_is_pinned(struct intel_context *ce)
|
||||
{
|
||||
return atomic_read(&ce->pin_count);
|
||||
}
|
||||
|
||||
static inline void intel_context_pin_unlock(struct intel_context *ce)
|
||||
__releases(ce->pin_mutex)
|
||||
{
|
||||
mutex_unlock(&ce->pin_mutex);
|
||||
}
|
||||
|
||||
struct intel_context *
|
||||
__intel_context_insert(struct i915_gem_context *ctx,
|
||||
struct intel_engine_cs *engine,
|
||||
@@ -53,18 +67,10 @@ intel_context_pin(struct i915_gem_context *ctx, struct intel_engine_cs *engine);
|
||||
|
||||
static inline void __intel_context_pin(struct intel_context *ce)
|
||||
{
|
||||
GEM_BUG_ON(!ce->pin_count);
|
||||
ce->pin_count++;
|
||||
GEM_BUG_ON(!intel_context_is_pinned(ce));
|
||||
atomic_inc(&ce->pin_count);
|
||||
}
|
||||
|
||||
static inline void intel_context_unpin(struct intel_context *ce)
|
||||
{
|
||||
GEM_BUG_ON(!ce->pin_count);
|
||||
if (--ce->pin_count)
|
||||
return;
|
||||
|
||||
GEM_BUG_ON(!ce->ops);
|
||||
ce->ops->unpin(ce);
|
||||
}
|
||||
void intel_context_unpin(struct intel_context *ce);
|
||||
|
||||
#endif /* __INTEL_CONTEXT_H__ */
|
||||
|
新增問題並參考
封鎖使用者