All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: Collect user engines at driver_register phase
Date: Sun, 27 Oct 2019 14:22:28 +0000	[thread overview]
Message-ID: <20191027142228.15764-1-michal.wajdeczko@intel.com> (raw)

There is no need to add engines to early uabi list one by one
during engine setup, we can collect all engines while doing final
renames at driver_register phase. This will also unblock us in
case we would need to do some late modifications of the engine
list after engine setup but before starting uabi registration.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_engine_cs.c   |  1 -
 drivers/gpu/drm/i915/gt/intel_engine_user.c | 15 +++++++++++++--
 drivers/gpu/drm/i915/gt/intel_engine_user.h |  1 -
 drivers/gpu/drm/i915/gt/mock_engine.c       |  2 --
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 9cc1ea6519ec..12056ad30b14 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -342,7 +342,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;
 
-	intel_engine_add_user(engine);
 	gt->i915->engine[id] = engine;
 
 	return 0;
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/gpu/drm/i915/gt/intel_engine_user.c
index 7f7150a733f4..e9231e27cdf1 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
@@ -35,10 +35,20 @@ intel_engine_lookup_user(struct drm_i915_private *i915, u8 class, u8 instance)
 	return NULL;
 }
 
-void intel_engine_add_user(struct intel_engine_cs *engine)
+static void add_engine(struct drm_i915_private *i915,
+		       struct intel_engine_cs *engine)
 {
 	llist_add((struct llist_node *)&engine->uabi_node,
-		  (struct llist_head *)&engine->i915->uabi_engines);
+		  (struct llist_head *)&i915->uabi_engines);
+}
+
+static void add_engines(struct drm_i915_private *i915)
+{
+	struct intel_engine_cs *engine;
+	enum intel_engine_id id;
+
+	for_each_engine(engine, i915, id)
+		add_engine(i915, engine);
 }
 
 static const u8 uabi_classes[] = {
@@ -190,6 +200,7 @@ void intel_engines_driver_register(struct drm_i915_private *i915)
 	struct rb_node **p, *prev;
 	LIST_HEAD(engines);
 
+	add_engines(i915);
 	sort_engines(i915, &engines);
 
 	prev = NULL;
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.h b/drivers/gpu/drm/i915/gt/intel_engine_user.h
index f845ea1cbfaa..7fb07fa98494 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.h
@@ -17,7 +17,6 @@ intel_engine_lookup_user(struct drm_i915_private *i915, u8 class, u8 instance);
 
 unsigned int intel_engines_has_context_isolation(struct drm_i915_private *i915);
 
-void intel_engine_add_user(struct intel_engine_cs *engine);
 void intel_engines_driver_register(struct drm_i915_private *i915);
 
 const char *intel_engine_class_repr(u8 class);
diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c
index 83f549d203a0..c36490a00b5d 100644
--- a/drivers/gpu/drm/i915/gt/mock_engine.c
+++ b/drivers/gpu/drm/i915/gt/mock_engine.c
@@ -277,8 +277,6 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
 	timer_setup(&engine->hw_delay, hw_delay_complete, 0);
 	INIT_LIST_HEAD(&engine->hw_queue);
 
-	intel_engine_add_user(&engine->base);
-
 	return &engine->base;
 }
 
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH] drm/i915: Collect user engines at driver_register phase
Date: Sun, 27 Oct 2019 14:22:28 +0000	[thread overview]
Message-ID: <20191027142228.15764-1-michal.wajdeczko@intel.com> (raw)
Message-ID: <20191027142228.aWJG7BUnsd4lvPgRvNCPrZefphS8swRDiojZZcr2-7k@z> (raw)

There is no need to add engines to early uabi list one by one
during engine setup, we can collect all engines while doing final
renames at driver_register phase. This will also unblock us in
case we would need to do some late modifications of the engine
list after engine setup but before starting uabi registration.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_engine_cs.c   |  1 -
 drivers/gpu/drm/i915/gt/intel_engine_user.c | 15 +++++++++++++--
 drivers/gpu/drm/i915/gt/intel_engine_user.h |  1 -
 drivers/gpu/drm/i915/gt/mock_engine.c       |  2 --
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 9cc1ea6519ec..12056ad30b14 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -342,7 +342,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;
 
-	intel_engine_add_user(engine);
 	gt->i915->engine[id] = engine;
 
 	return 0;
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/gpu/drm/i915/gt/intel_engine_user.c
index 7f7150a733f4..e9231e27cdf1 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
@@ -35,10 +35,20 @@ intel_engine_lookup_user(struct drm_i915_private *i915, u8 class, u8 instance)
 	return NULL;
 }
 
-void intel_engine_add_user(struct intel_engine_cs *engine)
+static void add_engine(struct drm_i915_private *i915,
+		       struct intel_engine_cs *engine)
 {
 	llist_add((struct llist_node *)&engine->uabi_node,
-		  (struct llist_head *)&engine->i915->uabi_engines);
+		  (struct llist_head *)&i915->uabi_engines);
+}
+
+static void add_engines(struct drm_i915_private *i915)
+{
+	struct intel_engine_cs *engine;
+	enum intel_engine_id id;
+
+	for_each_engine(engine, i915, id)
+		add_engine(i915, engine);
 }
 
 static const u8 uabi_classes[] = {
@@ -190,6 +200,7 @@ void intel_engines_driver_register(struct drm_i915_private *i915)
 	struct rb_node **p, *prev;
 	LIST_HEAD(engines);
 
+	add_engines(i915);
 	sort_engines(i915, &engines);
 
 	prev = NULL;
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.h b/drivers/gpu/drm/i915/gt/intel_engine_user.h
index f845ea1cbfaa..7fb07fa98494 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.h
@@ -17,7 +17,6 @@ intel_engine_lookup_user(struct drm_i915_private *i915, u8 class, u8 instance);
 
 unsigned int intel_engines_has_context_isolation(struct drm_i915_private *i915);
 
-void intel_engine_add_user(struct intel_engine_cs *engine);
 void intel_engines_driver_register(struct drm_i915_private *i915);
 
 const char *intel_engine_class_repr(u8 class);
diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c
index 83f549d203a0..c36490a00b5d 100644
--- a/drivers/gpu/drm/i915/gt/mock_engine.c
+++ b/drivers/gpu/drm/i915/gt/mock_engine.c
@@ -277,8 +277,6 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
 	timer_setup(&engine->hw_delay, hw_delay_complete, 0);
 	INIT_LIST_HEAD(&engine->hw_queue);
 
-	intel_engine_add_user(&engine->base);
-
 	return &engine->base;
 }
 
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2019-10-27 14:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-27 14:22 Michal Wajdeczko [this message]
2019-10-27 14:22 ` [Intel-gfx] [PATCH] drm/i915: Collect user engines at driver_register phase Michal Wajdeczko
2019-10-27 14:31 ` Chris Wilson
2019-10-27 14:31   ` [Intel-gfx] " Chris Wilson
2019-10-27 15:11 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-10-27 15:11   ` [Intel-gfx] " Patchwork
2019-10-28 15:20 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-10-28 15:20   ` [Intel-gfx] " 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=20191027142228.15764-1-michal.wajdeczko@intel.com \
    --to=michal.wajdeczko@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.