AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-24 00:22:07 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Pass intel_gt to intel_engines_init

Browse Source 
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:
Tvrtko Ursulin 2019-10-22 10:47:19 +01:00 committed by Chris Wilson
parent 78f606033b
commit 7841fcbdfb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/gt/intel_engine.h
View File

@ -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_init_mmio(struct intel_gt *gt);
int intel_engines_setup(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); void intel_engines_cleanup(struct intel_gt *gt);
int intel_engine_init_common(struct intel_engine_cs *engine); int intel_engine_init_common(struct intel_engine_cs *engine);

10
drivers/gpu/drm/i915/gt/intel_engine_cs.c
View File

@ -451,23 +451,23 @@ int intel_engines_init_mmio(struct intel_gt *gt)
/** /**
* intel_engines_init() - init the Engine Command Streamers * 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. * 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); int (*init)(struct intel_engine_cs *engine);
struct intel_engine_cs *engine; struct intel_engine_cs *engine;
enum intel_engine_id id; enum intel_engine_id id;
int err; int err;
if (HAS_EXECLISTS(i915)) if (HAS_EXECLISTS(gt->i915))
init = intel_execlists_submission_init; init = intel_execlists_submission_init;
else else
init = intel_ring_submission_init; init = intel_ring_submission_init;
for_each_engine(engine, i915, id) { for_each_engine(engine, gt, id) {
err = init(engine); err = init(engine);
if (err) if (err)
goto cleanup; goto cleanup;
@ -476,7 +476,7 @@ int intel_engines_init(struct drm_i915_private *i915)
return 0; return 0;
cleanup: cleanup:
intel_engines_cleanup(&i915->gt); intel_engines_cleanup(gt);
return err; return err;
} }

2
drivers/gpu/drm/i915/i915_gem.c
View File

@ -1261,7 +1261,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
goto err_scratch; goto err_scratch;
} }
ret = intel_engines_init(dev_priv); ret = intel_engines_init(&dev_priv->gt);
if (ret) { if (ret) {
GEM_BUG_ON(ret == -EIO); GEM_BUG_ON(ret == -EIO);
goto err_context; goto err_context;