From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 05/12] drm/i915: Pass intel_gt to intel_engines_init
Date: Tue, 22 Oct 2019 10:47:19 +0100 [thread overview]
Message-ID: <20191022094726.3001-6-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20191022094726.3001-1-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Engines belong to the GT so make it indicative in the API.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/gt/intel_engine.h | 2 +-
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 10 +++++-----
drivers/gpu/drm/i915/i915_gem.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h
index a947bbb60a22..c2d9d67c63d9 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine.h
@@ -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);
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index af64f9079b0f..0e20713603ec 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -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;
}
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 2dff716561e7..c028eb7e56b3 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1264,7 +1264,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;
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-10-22 9:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 9:47 [PATCH 00/12] Fewer for_each_engine(.., i915, ..) Tvrtko Ursulin
2019-10-22 9:47 ` [PATCH 01/12] drm/i915: Pass intel_gt to intel_engines_init_mmio Tvrtko Ursulin
2019-10-22 10:00 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 02/12] drm/i915: Pass intel_gt to intel_setup_engine_capabilities Tvrtko Ursulin
2019-10-22 10:00 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 03/12] drm/i915: Pass intel_gt to intel_engines_cleanup Tvrtko Ursulin
2019-10-22 10:01 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 04/12] drm/i915: Pass intel_gt to intel_engines_setup Tvrtko Ursulin
2019-10-22 10:01 ` Chris Wilson
2019-10-22 9:47 ` Tvrtko Ursulin [this message]
2019-10-22 10:02 ` [PATCH 05/12] drm/i915: Pass intel_gt to intel_engines_init Chris Wilson
2019-10-22 9:47 ` [PATCH 06/12] drm/i915: Pass intel_gt to intel_engines_verify_workarounds Tvrtko Ursulin
2019-10-22 10:02 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 07/12] drm/i915: Split drop caches into GT and i915 parts Tvrtko Ursulin
2019-10-22 10:04 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 08/12] drm/i915/selftests: Convert eviction selftests to gt/ggtt Tvrtko Ursulin
2019-10-22 10:06 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 09/12] drm/i915/selftests: Use GT engines in mock_gem_device Tvrtko Ursulin
2019-10-22 10:06 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 10/12] drm/i915/selftests: Use GT engines in igt_live_test Tvrtko Ursulin
2019-10-22 10:08 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 11/12] drm/i915/selftests: Use GT engines in i915_gem_mman selftest Tvrtko Ursulin
2019-10-22 10:11 ` Chris Wilson
2019-10-22 9:47 ` [PATCH 12/12] drm/i915/selftests: Use for_each_uabi_engine in contex selftests Tvrtko Ursulin
2019-10-22 10:54 ` Chris Wilson
2019-10-22 10:51 ` ✗ Fi.CI.BAT: failure for Fewer for_each_engine(.., i915, ..) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191022094726.3001-6-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.