Commit 73c8bfb7 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Drop final few uses of drm_i915_private.engine 



We've migrated all the heavy users over to the intel_gt, and can finally
drop the last few users and with that the mirror in dev_priv->engine[].

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200325234803.6175-1-chris@chris-wilson.co.uk
parent 9642b4f0

drivers/gpu/drm/i915/display/intel_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ void intel_overlay_setup(struct drm_i915_private *dev_priv) 
	if (!HAS_OVERLAY(dev_priv))

		return;



	engine = dev_priv->engine[RCS0];

	engine = dev_priv->gt.engine[RCS0];

	if (!engine || !engine->kernel_context)

		return;

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

+1 −1
Original line number Diff line number Diff line
@@ -1925,7 +1925,7 @@ static int mock_context_barrier(void *arg) 
		goto out;

	}



	rq = igt_request_alloc(ctx, i915->engine[RCS0]);

	rq = igt_request_alloc(ctx, i915->gt.engine[RCS0]);

	if (IS_ERR(rq)) {

		pr_err("Request allocation failed!\n");

		goto out;

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

+0 −4
Original line number Diff line number Diff line
@@ -347,8 +347,6 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) 
	gt->engine_class[info->class][info->instance] = engine;

	gt->engine[id] = engine;



	i915->engine[id] = engine;



	return 0;

}
@@ -425,8 +423,6 @@ void intel_engines_release(struct intel_gt *gt) 
		engine->release = NULL;



		memset(&engine->reset, 0, sizeof(engine->reset));



		gt->i915->engine[id] = NULL;

	}

}

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -884,7 +884,6 @@ struct drm_i915_private { 


	struct pci_dev *bridge_dev;



	struct intel_engine_cs *engine[I915_NUM_ENGINES];

	struct rb_root uabi_engines;



	struct resource mch_res;

drivers/gpu/drm/i915/i915_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -3648,7 +3648,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) 
		intel_uncore_write16(&dev_priv->uncore, GEN2_IIR, iir);



		if (iir & I915_USER_INTERRUPT)

			intel_engine_signal_breadcrumbs(dev_priv->engine[RCS0]);

			intel_engine_signal_breadcrumbs(dev_priv->gt.engine[RCS0]);



		if (iir & I915_MASTER_ERROR_INTERRUPT)

			i8xx_error_irq_handler(dev_priv, eir, eir_stuck);
@@ -3753,7 +3753,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) 
		I915_WRITE(GEN2_IIR, iir);



		if (iir & I915_USER_INTERRUPT)

			intel_engine_signal_breadcrumbs(dev_priv->engine[RCS0]);

			intel_engine_signal_breadcrumbs(dev_priv->gt.engine[RCS0]);



		if (iir & I915_MASTER_ERROR_INTERRUPT)

			i9xx_error_irq_handler(dev_priv, eir, eir_stuck);
@@ -3895,10 +3895,10 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) 
		I915_WRITE(GEN2_IIR, iir);



		if (iir & I915_USER_INTERRUPT)

			intel_engine_signal_breadcrumbs(dev_priv->engine[RCS0]);

			intel_engine_signal_breadcrumbs(dev_priv->gt.engine[RCS0]);



		if (iir & I915_BSD_USER_INTERRUPT)

			intel_engine_signal_breadcrumbs(dev_priv->engine[VCS0]);

			intel_engine_signal_breadcrumbs(dev_priv->gt.engine[VCS0]);



		if (iir & I915_MASTER_ERROR_INTERRUPT)

			i9xx_error_irq_handler(dev_priv, eir, eir_stuck);

CRA Git | Maintained and supported by SUSTech CRA and CCSE