mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-23 19:34:14 +07:00
drm/i915: Pass intel_gt to intel_engines_init
Engines belong to the GT so make it indicative in the API. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20191022094726.3001-6-tvrtko.ursulin@linux.intel.com
This commit is contained in:
parent
78f606033b
commit
7841fcbdfb
@ -326,7 +326,7 @@ __intel_ring_space(unsigned int head, unsigned int tail, unsigned int size)
|
||||
|
||||
int intel_engines_init_mmio(struct intel_gt *gt);
|
||||
int intel_engines_setup(struct intel_gt *gt);
|
||||
int intel_engines_init(struct drm_i915_private *i915);
|
||||
int intel_engines_init(struct intel_gt *gt);
|
||||
void intel_engines_cleanup(struct intel_gt *gt);
|
||||
|
||||
int intel_engine_init_common(struct intel_engine_cs *engine);
|
||||
|
@ -451,23 +451,23 @@ int intel_engines_init_mmio(struct intel_gt *gt)
|
||||
|
||||
/**
|
||||
* intel_engines_init() - init the Engine Command Streamers
|
||||
* @i915: i915 device private
|
||||
* @gt: pointer to struct intel_gt
|
||||
*
|
||||
* Return: non-zero if the initialization failed.
|
||||
*/
|
||||
int intel_engines_init(struct drm_i915_private *i915)
|
||||
int intel_engines_init(struct intel_gt *gt)
|
||||
{
|
||||
int (*init)(struct intel_engine_cs *engine);
|
||||
struct intel_engine_cs *engine;
|
||||
enum intel_engine_id id;
|
||||
int err;
|
||||
|
||||
if (HAS_EXECLISTS(i915))
|
||||
if (HAS_EXECLISTS(gt->i915))
|
||||
init = intel_execlists_submission_init;
|
||||
else
|
||||
init = intel_ring_submission_init;
|
||||
|
||||
for_each_engine(engine, i915, id) {
|
||||
for_each_engine(engine, gt, id) {
|
||||
err = init(engine);
|
||||
if (err)
|
||||
goto cleanup;
|
||||
@ -476,7 +476,7 @@ int intel_engines_init(struct drm_i915_private *i915)
|
||||
return 0;
|
||||
|
||||
cleanup:
|
||||
intel_engines_cleanup(&i915->gt);
|
||||
intel_engines_cleanup(gt);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -1261,7 +1261,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
|
||||
goto err_scratch;
|
||||
}
|
||||
|
||||
ret = intel_engines_init(dev_priv);
|
||||
ret = intel_engines_init(&dev_priv->gt);
|
||||
if (ret) {
|
||||
GEM_BUG_ON(ret == -EIO);
|
||||
goto err_context;
|
||||
|
Loading…
Reference in New Issue
Block a user