From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 01/12] drm/i915: Pass intel_gt to intel_engines_init_mmio
Date: Tue, 22 Oct 2019 10:47:15 +0100 [thread overview]
Message-ID: <20191022094726.3001-2-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 | 4 +++-
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 +++++----
drivers/gpu/drm/i915/i915_drv.c | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h
index 93ea367fe624..638b19544acd 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine.h
@@ -20,6 +20,8 @@
struct drm_printer;
+struct intel_gt;
+
/* Early gen2 devices have a cacheline of just 32 bytes, using 64 is overkill,
* but keeps the logic simple. Indeed, the whole purpose of this macro is just
* to give some inclination as to some of the magic values used in the various
@@ -322,7 +324,7 @@ __intel_ring_space(unsigned int head, unsigned int tail, unsigned int size)
return (head - tail - CACHELINE_BYTES) & (size - 1);
}
-int intel_engines_init_mmio(struct drm_i915_private *i915);
+int intel_engines_init_mmio(struct intel_gt *gt);
int intel_engines_setup(struct drm_i915_private *i915);
int intel_engines_init(struct drm_i915_private *i915);
void intel_engines_cleanup(struct drm_i915_private *i915);
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 051734c9b733..735037f11cc5 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -396,12 +396,13 @@ void intel_engines_cleanup(struct drm_i915_private *i915)
/**
* intel_engines_init_mmio() - allocate and prepare the Engine Command Streamers
- * @i915: the i915 device
+ * @gt: pointer to struct intel_gt
*
* Return: non-zero if the initialization failed.
*/
-int intel_engines_init_mmio(struct drm_i915_private *i915)
+int intel_engines_init_mmio(struct intel_gt *gt)
{
+ struct drm_i915_private *i915 = gt->i915;
struct intel_device_info *device_info = mkwrite_device_info(i915);
const unsigned int engine_mask = INTEL_INFO(i915)->engine_mask;
unsigned int mask = 0;
@@ -419,7 +420,7 @@ int intel_engines_init_mmio(struct drm_i915_private *i915)
if (!HAS_ENGINE(i915, i))
continue;
- err = intel_engine_setup(&i915->gt, i);
+ err = intel_engine_setup(gt, i);
if (err)
goto cleanup;
@@ -436,7 +437,7 @@ int intel_engines_init_mmio(struct drm_i915_private *i915)
RUNTIME_INFO(i915)->num_engines = hweight32(mask);
- intel_gt_check_and_clear_faults(&i915->gt);
+ intel_gt_check_and_clear_faults(gt);
intel_setup_engine_capabilities(i915);
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 21b36a6143b9..334931224a21 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -598,7 +598,7 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
intel_uc_init_mmio(&dev_priv->gt.uc);
- ret = intel_engines_init_mmio(dev_priv);
+ ret = intel_engines_init_mmio(&dev_priv->gt);
if (ret)
goto err_uncore;
--
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 ` Tvrtko Ursulin [this message]
2019-10-22 10:00 ` [PATCH 01/12] drm/i915: Pass intel_gt to intel_engines_init_mmio 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 ` [PATCH 05/12] drm/i915: Pass intel_gt to intel_engines_init Tvrtko Ursulin
2019-10-22 10:02 ` 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-2-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox