Commit cb0c43f3 authored by Chris Wilson's avatar Chris Wilson

drm/i915: Avoid ce->gem_context->i915

My plan for the future is to have kernel contexts not to have a GEM
context backpointer (as they will not belong to any GEM context). In a
few places, we use ce->gem_context to simply obtain the i915 backpointer,
for which we can use ce->engine->i915 instead.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190730163441.16477-1-chris@chris-wilson.co.uk
parent 2e8de087
...@@ -152,7 +152,7 @@ static void clear_pages_dma_fence_cb(struct dma_fence *fence, ...@@ -152,7 +152,7 @@ static void clear_pages_dma_fence_cb(struct dma_fence *fence,
static void clear_pages_worker(struct work_struct *work) static void clear_pages_worker(struct work_struct *work)
{ {
struct clear_pages_work *w = container_of(work, typeof(*w), work); struct clear_pages_work *w = container_of(work, typeof(*w), work);
struct drm_i915_private *i915 = w->ce->gem_context->i915; struct drm_i915_private *i915 = w->ce->engine->i915;
struct drm_i915_gem_object *obj = w->sleeve->vma->obj; struct drm_i915_gem_object *obj = w->sleeve->vma->obj;
struct i915_vma *vma = w->sleeve->vma; struct i915_vma *vma = w->sleeve->vma;
struct i915_request *rq; struct i915_request *rq;
......
...@@ -1194,7 +1194,7 @@ __intel_context_reconfigure_sseu(struct intel_context *ce, ...@@ -1194,7 +1194,7 @@ __intel_context_reconfigure_sseu(struct intel_context *ce,
{ {
int ret; int ret;
GEM_BUG_ON(INTEL_GEN(ce->gem_context->i915) < 8); GEM_BUG_ON(INTEL_GEN(ce->engine->i915) < 8);
ret = intel_context_lock_pinned(ce); ret = intel_context_lock_pinned(ce);
if (ret) if (ret)
...@@ -1216,7 +1216,7 @@ __intel_context_reconfigure_sseu(struct intel_context *ce, ...@@ -1216,7 +1216,7 @@ __intel_context_reconfigure_sseu(struct intel_context *ce,
static int static int
intel_context_reconfigure_sseu(struct intel_context *ce, struct intel_sseu sseu) intel_context_reconfigure_sseu(struct intel_context *ce, struct intel_sseu sseu)
{ {
struct drm_i915_private *i915 = ce->gem_context->i915; struct drm_i915_private *i915 = ce->engine->i915;
int ret; int ret;
ret = mutex_lock_interruptible(&i915->drm.struct_mutex); ret = mutex_lock_interruptible(&i915->drm.struct_mutex);
......
...@@ -1667,7 +1667,7 @@ gen8_update_reg_state_unlocked(struct intel_context *ce, ...@@ -1667,7 +1667,7 @@ gen8_update_reg_state_unlocked(struct intel_context *ce,
u32 *reg_state, u32 *reg_state,
const struct i915_oa_config *oa_config) const struct i915_oa_config *oa_config)
{ {
struct drm_i915_private *i915 = ce->gem_context->i915; struct drm_i915_private *i915 = ce->engine->i915;
u32 ctx_oactxctrl = i915->perf.oa.ctx_oactxctrl_offset; u32 ctx_oactxctrl = i915->perf.oa.ctx_oactxctrl_offset;
u32 ctx_flexeu0 = i915->perf.oa.ctx_flexeu0_offset; u32 ctx_flexeu0 = i915->perf.oa.ctx_flexeu0_offset;
/* The MMIO offsets for Flex EU registers aren't contiguous */ /* The MMIO offsets for Flex EU registers aren't contiguous */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment