Commit de5825be authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Serialise with engine-pm around requests on the kernel_context 



As the engine->kernel_context is used within the engine-pm barrier, we
have to be careful when emitting requests outside of the barrier, as the
strict timeline locking rules do not apply. Instead, we must ensure the
engine_park() cannot be entered as we build the request, which is
simplest by taking an explicit engine-pm wakeref around the request
construction.

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/20191125105858.1718307-1-chris@chris-wilson.co.uk
parent da0ef77e

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

+2 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#include <drm/i915_drm.h>



#include "gt/intel_engine_heartbeat.h"

#include "gt/intel_engine_pm.h"

#include "gt/intel_engine_user.h"

#include "gt/intel_lrc_reg.h"

#include "gt/intel_ring.h"
@@ -1265,7 +1266,7 @@ gen8_modify_rpcs(struct intel_context *ce, struct intel_sseu sseu) 
	if (!intel_context_is_pinned(ce))

		return 0;



	rq = i915_request_create(ce->engine->kernel_context);

	rq = intel_engine_create_kernel_request(ce->engine);

	if (IS_ERR(rq))

		return PTR_ERR(rq);

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static int __igt_client_fill(struct intel_engine_cs *engine) 


	prandom_seed_state(&prng, i915_selftest.random_seed);



	intel_engine_pm_get(engine);

	do {

		const u32 max_block_size = S16_MAX * PAGE_SIZE;

		u32 sz = min_t(u64, ce->vm->total >> 4, prandom_u32_state(&prng));
@@ -99,6 +100,7 @@ err_put: 
err_flush:

	if (err == -ENOMEM)

		err = 0;

	intel_engine_pm_put(engine);



	return err;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/prime_numbers.h>



#include "gt/intel_engine_pm.h"

#include "gt/intel_gt.h"

#include "gt/intel_gt_pm.h"

#include "gt/intel_ring.h"
@@ -200,7 +201,7 @@ static int gpu_set(struct context *ctx, unsigned long offset, u32 v) 
	if (IS_ERR(vma))

		return PTR_ERR(vma);



	rq = i915_request_create(ctx->engine->kernel_context);

	rq = intel_engine_create_kernel_request(ctx->engine);

	if (IS_ERR(rq)) {

		i915_vma_unpin(vma);

		return PTR_ERR(rq);

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

+6 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/prime_numbers.h>



#include "gem/i915_gem_pm.h"

#include "gt/intel_engine_pm.h"

#include "gt/intel_gt.h"

#include "gt/intel_gt_requests.h"

#include "gt/intel_reset.h"
@@ -1190,9 +1191,11 @@ __sseu_test(const char *name, 
	struct igt_spinner *spin = NULL;

	int ret;



	intel_engine_pm_get(ce->engine);



	ret = __sseu_prepare(name, flags, ce, &spin);

	if (ret)

		return ret;

		goto out_pm;



	ret = intel_context_reconfigure_sseu(ce, sseu);

	if (ret)
@@ -1207,6 +1210,8 @@ out_spin: 
		igt_spinner_fini(spin);

		kfree(spin);

	}

out_pm:

	intel_engine_pm_put(ce->engine);

	return ret;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/prime_numbers.h>



#include "gt/intel_engine_pm.h"

#include "gt/intel_gt.h"

#include "gt/intel_gt_pm.h"

#include "huge_gem_object.h"
@@ -536,7 +537,7 @@ static int make_obj_busy(struct drm_i915_gem_object *obj) 
		if (err)

			return err;



		rq = i915_request_create(engine->kernel_context);

		rq = intel_engine_create_kernel_request(engine);

		if (IS_ERR(rq)) {

			i915_vma_unpin(vma);

			return PTR_ERR(rq);

CRA Git | Maintained and supported by SUSTech CRA and CCSE