UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/gt: Export the pinned context constructor and destructor 

Allow internal clients to create and destroy a pinned context.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210617063018.92802-7-thomas.hellstrom@linux.intel.com
This commit is contained in:
Chris Wilson 2021-06-17 08:30:12 +02:00 committed by Matthew Auld
parent 3607e1e9ba
commit b4ef953091
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/gt/intel_engine.h
View File

@ -19,7 +19,9 @@
#include "intel_workarounds.h" #include "intel_workarounds.h"
struct drm_printer; struct drm_printer;
struct intel_context;
struct intel_gt; struct intel_gt;
struct lock_class_key;
/* Early gen2 devices have a cacheline of just 32 bytes, using 64 is overkill, /* Early gen2 devices have a cacheline of just 32 bytes, using 64 is overkill,
* but keeps the logic simple. Indeed, the whole purpose of this macro is just * but keeps the logic simple. Indeed, the whole purpose of this macro is just
@ -256,6 +258,15 @@ struct i915_request *
intel_engine_find_active_request(struct intel_engine_cs *engine); intel_engine_find_active_request(struct intel_engine_cs *engine);
u32 intel_engine_context_size(struct intel_gt *gt, u8 class); u32 intel_engine_context_size(struct intel_gt *gt, u8 class);
struct intel_context *
intel_engine_create_pinned_context(struct intel_engine_cs *engine,
struct i915_address_space *vm,
unsigned int ring_size,
unsigned int hwsp,
struct lock_class_key *key,
const char *name);
void intel_engine_destroy_pinned_context(struct intel_context *ce);
void intel_engine_init_active(struct intel_engine_cs *engine, void intel_engine_init_active(struct intel_engine_cs *engine,
unsigned int subclass); unsigned int subclass);

27
drivers/gpu/drm/i915/gt/intel_engine_cs.c
View File

@ -810,11 +810,13 @@ intel_engine_init_active(struct intel_engine_cs *engine, unsigned int subclass)
#endif #endif
} }
static struct intel_context * struct intel_context *
create_pinned_context(struct intel_engine_cs *engine, intel_engine_create_pinned_context(struct intel_engine_cs *engine,
unsigned int hwsp, struct i915_address_space *vm,
struct lock_class_key *key, unsigned int ring_size,
const char *name) unsigned int hwsp,
struct lock_class_key *key,
const char *name)
{ {
struct intel_context *ce; struct intel_context *ce;
int err; int err;
@ -825,6 +827,10 @@ create_pinned_context(struct intel_engine_cs *engine,
__set_bit(CONTEXT_BARRIER_BIT, &ce->flags); __set_bit(CONTEXT_BARRIER_BIT, &ce->flags);
ce->timeline = page_pack_bits(NULL, hwsp); ce->timeline = page_pack_bits(NULL, hwsp);
ce->ring = __intel_context_ring_size(ring_size);
i915_vm_put(ce->vm);
ce->vm = i915_vm_get(vm);
err = intel_context_pin(ce); /* perma-pin so it is always available */ err = intel_context_pin(ce); /* perma-pin so it is always available */
if (err) { if (err) {
@ -843,7 +849,7 @@ create_pinned_context(struct intel_engine_cs *engine,
return ce; return ce;
} }
static void destroy_pinned_context(struct intel_context *ce) void intel_engine_destroy_pinned_context(struct intel_context *ce)
{ {
struct intel_engine_cs *engine = ce->engine; struct intel_engine_cs *engine = ce->engine;
struct i915_vma *hwsp = engine->status_page.vma; struct i915_vma *hwsp = engine->status_page.vma;
@ -863,8 +869,9 @@ create_kernel_context(struct intel_engine_cs *engine)
{ {
static struct lock_class_key kernel; static struct lock_class_key kernel;
return create_pinned_context(engine, I915_GEM_HWS_SEQNO_ADDR, return intel_engine_create_pinned_context(engine, engine->gt->vm, SZ_4K,
&kernel, "kernel_context"); I915_GEM_HWS_SEQNO_ADDR,
&kernel, "kernel_context");
} }
/** /**
@ -907,7 +914,7 @@ static int engine_init_common(struct intel_engine_cs *engine)
return 0; return 0;
err_context: err_context:
destroy_pinned_context(ce); intel_engine_destroy_pinned_context(ce);
return ret; return ret;
} }
@ -969,7 +976,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)
fput(engine->default_state); fput(engine->default_state);
if (engine->kernel_context) if (engine->kernel_context)
destroy_pinned_context(engine->kernel_context); intel_engine_destroy_pinned_context(engine->kernel_context);
GEM_BUG_ON(!llist_empty(&engine->barrier_tasks)); GEM_BUG_ON(!llist_empty(&engine->barrier_tasks));
cleanup_status_page(engine); cleanup_status_page(engine);