Commit ba4134a4 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Save trip via top-level i915 in a few more places 



For gt related operations it makes more logical sense to stay in the realm
of gt instead of dereferencing via driver i915.

This patch handles a few of the easy ones with work requiring more
refactoring still outstanding.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-30-tvrtko.ursulin@linux.intel.com
parent db45fb5b

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+1 −2
Original line number Diff line number Diff line
@@ -1039,8 +1039,7 @@ static int __igt_write_huge(struct i915_gem_context *ctx, 
			    u64 size, u64 offset,

			    u32 dword, u32 val)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_address_space *vm = ctx->vm ?: &i915->ggtt.vm;

	struct i915_address_space *vm = ctx->vm ?: &engine->gt->ggtt->vm;

	unsigned int flags = PIN_USER | PIN_OFFSET_FIXED;

	struct i915_vma *vma;

	int err;

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ static int gpu_fill(struct drm_i915_gem_object *obj, 
		    struct intel_engine_cs *engine,

		    unsigned int dw)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_address_space *vm = ctx->vm ?: &i915->ggtt.vm;

	struct i915_address_space *vm = ctx->vm ?: &engine->gt->ggtt->vm;

	struct i915_request *rq;

	struct i915_vma *vma;

	struct i915_vma *batch;

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int init_status_page(struct intel_engine_cs *engine) 


	i915_gem_object_set_cache_coherency(obj, I915_CACHE_LLC);



	vma = i915_vma_instance(obj, &engine->i915->ggtt.vm, NULL);

	vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);

	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		goto err;

drivers/gpu/drm/i915/gt/intel_lrc.c

+2 −2
Original line number Diff line number Diff line
@@ -1954,7 +1954,7 @@ static int lrc_setup_wa_ctx(struct intel_engine_cs *engine) 
	if (IS_ERR(obj))

		return PTR_ERR(obj);



	vma = i915_vma_instance(obj, &engine->i915->ggtt.vm, NULL);

	vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);

	if (IS_ERR(vma)) {

		err = PTR_ERR(vma);

		goto err;
@@ -3038,7 +3038,7 @@ static int execlists_context_deferred_alloc(struct intel_context *ce, 
	if (IS_ERR(ctx_obj))

		return PTR_ERR(ctx_obj);



	vma = i915_vma_instance(ctx_obj, &engine->i915->ggtt.vm, NULL);

	vma = i915_vma_instance(ctx_obj, &engine->gt->ggtt->vm, NULL);

	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		goto error_deref_obj;

drivers/gpu/drm/i915/gt/intel_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ alloc_context_vma(struct intel_engine_cs *engine) 
		i915_gem_object_unpin_map(obj);

	}



	vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);

	vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);

	if (IS_ERR(vma)) {

		err = PTR_ERR(vma);

		goto err_obj;