Skip to contentSkip to conversation

GuC submission functions/struct name/prototype update

PATCH Superseded Sagar Arun Kamble 4 participants 19 messages Nov 13, 2017 – Nov 14, 2017

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover GuC submission functions/struct name/prototype update

We want to have consistent function/structure/file naming and function parameter semantics. Suggestion from Michal Wajdeczko about using "genx_" prefix (or better _genx" suffix for all hw related structures types, offsets), "i915_" prefix for driver entry calls and "intel_" in all other seems to be the good scheme to go ahead. Also we need to adhere to practise of passing drm_i915_private to functions with "i915_" prefix and component structure to functions with "intel_" prefix. This series updates GuC submission related code with these changes.

With GuC submission being hardware interface for i915, we should name those functions with prefix "intel_guc" and pass struct intel_guc as parameter. Also i915_guc_client struct is kernel-hw interaction structure hence rename that to intel_guc_client.
With these changes GuC submission source files are now named with "intel_" prefix.

Note: Sujaritha's restructuring series and other depend on this series.

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>

Sagar Arun Kamble (4):
drm/i915/guc: Update name and prototype of GuC submission related
functions
drm/i915/guc: Rename i915_guc_client struct to intel_guc_client drm/i915/guc: Rename i915_guc_submission.c|h to
intel_guc_submission.c|h
HAX enable GuC submission for CI

 Documentation/gpu/i915.rst                  |    4 +-
 drivers/gpu/drm/i915/Makefile               |    4 +-
 drivers/gpu/drm/i915/i915_debugfs.c         |    6 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c         |    8 +-
 drivers/gpu/drm/i915/i915_guc_submission.c  | 1466 --------------------------
 drivers/gpu/drm/i915/i915_guc_submission.h  |   80 --
 drivers/gpu/drm/i915/i915_params.h          |    4 +-
 drivers/gpu/drm/i915/intel_guc.c            |    2 +-
 drivers/gpu/drm/i915/intel_guc.h            |    6 +-
 drivers/gpu/drm/i915/intel_guc_submission.c | 1477 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc_submission.h |   81 ++
 drivers/gpu/drm/i915/intel_uc.c             |   12 +-
 12 files changed, 1579 insertions(+), 1571 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c
 delete mode 100644 drivers/gpu/drm/i915/i915_guc_submission.h
 create mode 100644 drivers/gpu/drm/i915/intel_guc_submission.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc_submission.h
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/4 drm/i915/guc: Update name and prototype of GuC submission related functions

i915 GuC submission is hardware interface and GuC APIs that are not user facing should be named intel_guc* hence we change GuC submission related functions name prefix to intel_guc. Also changed the parameter to these functions to intel_guc struct.

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_guc_submission.c | 39 ++++++++++++++----------------
 drivers/gpu/drm/i915/i915_guc_submission.h |  8 +++---
 drivers/gpu/drm/i915/intel_uc.c            | 10 ++++----
 3 files changed, 27 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +18 -21
index 0ba2fc0..42dc5b4 100644
@@ -683,13 +683,13 @@ static void wait_for_guc_preempt_report(struct intel_engine_cs *engine)
 }
 
 /**
- * i915_guc_submit() - Submit commands through GuC
+ * intel_guc_submit() - Submit commands through GuC
  * @engine: engine associated with the commands
  *
  * The only error here arises if the doorbell hardware isn't functioning
  * as expected, which really shouln't happen.
  */
-static void i915_guc_submit(struct intel_engine_cs *engine)
+static void intel_guc_submit(struct intel_engine_cs *engine)
 {
 	struct intel_guc *guc = &engine->i915->guc;
 	struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -722,7 +722,7 @@ static void port_assign(struct execlist_port *port,
 	port_set(port, port_pack(i915_gem_request_get(rq), port_count(port)));
 }
 
-static void i915_guc_dequeue(struct intel_engine_cs *engine)
+static void intel_guc_dequeue(struct intel_engine_cs *engine)
 {
 	struct intel_engine_execlists * const execlists = &engine->execlists;
 	struct execlist_port *port = execlists->port;
@@ -793,13 +793,13 @@ static void i915_guc_dequeue(struct intel_engine_cs *engine)
 	if (submit) {
 		port_assign(port, last);
 		execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
-		i915_guc_submit(engine);
+		intel_guc_submit(engine);
 	}
 unlock:
 	spin_unlock_irq(&engine->timeline->lock);
 }
 
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)
 {
 	struct intel_engine_cs * const engine = (struct intel_engine_cs *)data;
 	struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -831,13 +831,13 @@ static void i915_guc_irq_handler(unsigned long data)
 	}
 
 	if (!execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT))
-		i915_guc_dequeue(engine);
+		intel_guc_dequeue(engine);
 }
 
 /*
  * Everything below here is concerned with setup & teardown, and is
  * therefore not part of the somewhat time-critical batch-submission
- * path of i915_guc_submit() above.
+ * path of intel_guc_submit() above.
  */
 
 /* Check that a doorbell register is in the expected state */
@@ -1253,9 +1253,8 @@ static void guc_preempt_work_destroy(struct intel_guc *guc)
  * Set up the memory resources to be shared with the GuC (via the GGTT)
  * at firmware loading time.
  */
-int i915_guc_submission_init(struct drm_i915_private *dev_priv)
+int intel_guc_submission_init(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
 	int ret;
 
 	if (guc->stage_desc_pool)
@@ -1302,10 +1301,8 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
+void intel_guc_submission_fini(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
-
 	guc_ads_destroy(guc);
 	guc_preempt_work_destroy(guc);
 	intel_guc_log_destroy(guc);
@@ -1381,19 +1378,19 @@ static void guc_interrupts_release(struct drm_i915_private *dev_priv)
 	rps->pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK;
 }
 
-static void i915_guc_submission_park(struct intel_engine_cs *engine)
+static void intel_guc_submission_park(struct intel_engine_cs *engine)
 {
 	intel_engine_unpin_breadcrumbs_irq(engine);
 }
 
-static void i915_guc_submission_unpark(struct intel_engine_cs *engine)
+static void intel_guc_submission_unpark(struct intel_engine_cs *engine)
 {
 	intel_engine_pin_breadcrumbs_irq(engine);
 }
 
-int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
+int intel_guc_submission_enable(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct intel_engine_cs *engine;
 	enum intel_engine_id id;
 	int err;
@@ -1439,9 +1436,9 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
 
 	for_each_engine(engine, dev_priv, id) {
 		struct intel_engine_execlists * const execlists = &engine->execlists;
-		execlists->irq_tasklet.func = i915_guc_irq_handler;
-		engine->park = i915_guc_submission_park;
-		engine->unpark = i915_guc_submission_unpark;
+		execlists->irq_tasklet.func = intel_guc_irq_handler;
+		engine->park = intel_guc_submission_park;
+		engine->unpark = intel_guc_submission_unpark;
 	}
 
 	return 0;
@@ -1451,9 +1448,9 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
 	return err;
 }
 
-void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
+void intel_guc_submission_disable(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 
 	GEM_BUG_ON(dev_priv->gt.awake); /* GT should be parked first */
 
drivers/gpu/drm/i915/i915_guc_submission.h +4 -4
index cb4353b..6bdb8fc 100644
@@ -72,9 +72,9 @@ struct i915_guc_client {
 	u64 submissions[I915_NUM_ENGINES];
 };
 
-int i915_guc_submission_init(struct drm_i915_private *dev_priv);
-int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+int intel_guc_submission_init(struct intel_guc *guc);
+int intel_guc_submission_enable(struct intel_guc *guc);
+void intel_guc_submission_disable(struct intel_guc *guc);
+void intel_guc_submission_fini(struct intel_guc *guc);
 
 #endif
drivers/gpu/drm/i915/intel_uc.c +5 -5
index aec2954..775db48 100644
@@ -168,7 +168,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 		 * This is stuff we need to have available at fw load time
 		 * if we are planning to enable submission later
 		 */
-		ret = i915_guc_submission_init(dev_priv);
+		ret = intel_guc_submission_init(guc);
 		if (ret)
 			goto err_guc;
 	}
@@ -217,7 +217,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 		if (i915_modparams.guc_log_level >= 0)
 			gen9_enable_guc_interrupts(dev_priv);
 
-		ret = i915_guc_submission_enable(dev_priv);
+		ret = intel_guc_submission_enable(guc);
 		if (ret)
 			goto err_interrupts;
 	}
@@ -246,7 +246,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	guc_capture_load_err_log(guc);
 err_submission:
 	if (i915_modparams.enable_guc_submission)
-		i915_guc_submission_fini(dev_priv);
+		intel_guc_submission_fini(guc);
 err_guc:
 	i915_ggtt_disable_guc(dev_priv);
 
@@ -277,13 +277,13 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 		return;
 
 	if (i915_modparams.enable_guc_submission)
-		i915_guc_submission_disable(dev_priv);
+		intel_guc_submission_disable(&dev_priv->guc);
 
 	guc_disable_communication(&dev_priv->guc);
 
 	if (i915_modparams.enable_guc_submission) {
 		gen9_disable_guc_interrupts(dev_priv);
-		i915_guc_submission_fini(dev_priv);
+		intel_guc_submission_fini(&dev_priv->guc);
 	}
 
 	i915_ggtt_disable_guc(dev_priv);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoted 30 lines · Sagar Arun Kamble

i915 GuC submission is hardware interface and GuC APIs that are not user facing should be named intel_guc* hence we change GuC submission related functions name prefix to intel_guc. Also changed the parameter to these functions to intel_guc struct.

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_guc_submission.c | 39  
++++++++++++++----------------
 drivers/gpu/drm/i915/i915_guc_submission.h |  8 +++---
 drivers/gpu/drm/i915/intel_uc.c            | 10 ++++----
 3 files changed, 27 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +0 -0
index 0ba2fc0..42dc5b4 100644

drivers/gpu/drm/i915/i915_guc_submission.c static void wait_for_guc_preempt_report(struct · line 690

Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -683,13 +683,13 @@ static void wait_for_guc_preempt_report(struct  
 intel_engine_cs *engine)
 }
 /**
- * i915_guc_submit() - Submit commands through GuC
+ * intel_guc_submit() - Submit commands through GuC
  * @engine: engine associated with the commands
  *
  * The only error here arises if the doorbell hardware isn't functioning
  * as expected, which really shouln't happen.
                                ^

While here, please fix this old typo.

drivers/gpu/drm/i915/i915_guc_submission.c static void wait_for_guc_preempt_report(struct intel_engine_cs *engine) · line 692

Quoted 3 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
  */
-static void i915_guc_submit(struct intel_engine_cs *engine)
+static void intel_guc_submit(struct intel_engine_cs *engine)

Hmm, this is static function and neither old or new name looks good or correct as function takes engine as parameter not guc.

What about plain and simple "submit_through_guc(engine)" ? Or more formal "engine_submit_through_guc(engine)" ?

drivers/gpu/drm/i915/i915_guc_submission.c static void port_assign(struct execlist_port *port, · line 724

Quoted 8 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
 {
 	struct intel_guc *guc = &engine->i915->guc;
 	struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -722,7 +722,7 @@ static void port_assign(struct execlist_port *port,
 	port_set(port, port_pack(i915_gem_request_get(rq), port_count(port)));
 }
-static void i915_guc_dequeue(struct intel_engine_cs *engine)
+static void intel_guc_dequeue(struct intel_engine_cs *engine)

and then matching "dequeue_and_submit(engine)"

Quoted 6 lines
drivers/gpu/drm/i915/i915_guc_submission.c +0 -0
 {
 	struct intel_engine_execlists * const execlists = &engine->execlists;
 	struct execlist_port *port = execlists->port;
@@ -793,13 +793,13 @@ static void i915_guc_dequeue(struct  
 intel_engine_cs *engine)
 	if (submit) {

drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_dequeue(struct · line 802

Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
 		port_assign(port, last);
 		execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
-		i915_guc_submit(engine);
+		intel_guc_submit(engine);
 	}
 unlock:
 	spin_unlock_irq(&engine->timeline->lock);
 }
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Quoted 41 lines
drivers/gpu/drm/i915/i915_guc_submission.c +4 -7
 {
 	struct intel_engine_cs * const engine = (struct intel_engine_cs *)data;
 	struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -831,13 +831,13 @@ static void i915_guc_irq_handler(unsigned long  
 data)
 	}
 	if (!execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT))
-		i915_guc_dequeue(engine);
+		intel_guc_dequeue(engine);
 }
 /*
  * Everything below here is concerned with setup & teardown, and is
  * therefore not part of the somewhat time-critical batch-submission
- * path of i915_guc_submit() above.
+ * path of intel_guc_submit() above.
  */
 /* Check that a doorbell register is in the expected state */
@@ -1253,9 +1253,8 @@ static void guc_preempt_work_destroy(struct  
 intel_guc *guc)
  * Set up the memory resources to be shared with the GuC (via the GGTT)
  * at firmware loading time.
  */
-int i915_guc_submission_init(struct drm_i915_private *dev_priv)
+int intel_guc_submission_init(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
 	int ret;
 	if (guc->stage_desc_pool)
@@ -1302,10 +1301,8 @@ int i915_guc_submission_init(struct  
 drm_i915_private *dev_priv)
 	return ret;
 }
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
+void intel_guc_submission_fini(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
-
 	guc_ads_destroy(guc);
 	guc_preempt_work_destroy(guc);
 	intel_guc_log_destroy(guc);

drivers/gpu/drm/i915/i915_guc_submission.c static void guc_interrupts_release(struct · line 1385

Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -1381,19 +1378,19 @@ static void guc_interrupts_release(struct  
 drm_i915_private *dev_priv)
 	rps->pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK;
 }
-static void i915_guc_submission_park(struct intel_engine_cs *engine)
+static void intel_guc_submission_park(struct intel_engine_cs *engine)
 {
 	intel_engine_unpin_breadcrumbs_irq(engine);
 }
-static void i915_guc_submission_unpark(struct intel_engine_cs *engine)
+static void intel_guc_submission_unpark(struct intel_engine_cs *engine)

Both park/unpark are also static and do not require "intel" prefix.

Quoted 12 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
 {
 	intel_engine_pin_breadcrumbs_irq(engine);
 }
-int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
+int intel_guc_submission_enable(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct intel_engine_cs *engine;
 	enum intel_engine_id id;
 	int err;

drivers/gpu/drm/i915/i915_guc_submission.c int i915_guc_submission_enable(struct · line 1441

Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_submission.c +3 -3
@@ -1439,9 +1436,9 @@ int i915_guc_submission_enable(struct  
 drm_i915_private *dev_priv)
 	for_each_engine(engine, dev_priv, id) {
 		struct intel_engine_execlists * const execlists = &engine->execlists;
-		execlists->irq_tasklet.func = i915_guc_irq_handler;
-		engine->park = i915_guc_submission_park;
-		engine->unpark = i915_guc_submission_unpark;
+		execlists->irq_tasklet.func = intel_guc_irq_handler;
+		engine->park = intel_guc_submission_park;
+		engine->unpark = intel_guc_submission_unpark;

Then we'll have:

	execlists->irq_tasklet.func = guc_submission_handler;
	engine->park = guc_submission_park;
	engine->unpark = guc_submission_unpark;
Quoted 61 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
 	}
 	return 0;
@@ -1451,9 +1448,9 @@ int i915_guc_submission_enable(struct  
 drm_i915_private *dev_priv)
 	return err;
 }
-void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
+void intel_guc_submission_disable(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	GEM_BUG_ON(dev_priv->gt.awake); /* GT should be parked first */
drivers/gpu/drm/i915/i915_guc_submission.h +4 -4
index cb4353b..6bdb8fc 100644
@@ -72,9 +72,9 @@ struct i915_guc_client {
 	u64 submissions[I915_NUM_ENGINES];
 };
-int i915_guc_submission_init(struct drm_i915_private *dev_priv);
-int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+int intel_guc_submission_init(struct intel_guc *guc);
+int intel_guc_submission_enable(struct intel_guc *guc);
+void intel_guc_submission_disable(struct intel_guc *guc);
+void intel_guc_submission_fini(struct intel_guc *guc);
 #endif
drivers/gpu/drm/i915/intel_uc.c +1 -1
index aec2954..775db48 100644
@@ -168,7 +168,7 @@ int intel_uc_init_hw(struct drm_i915_private  
 *dev_priv)
 		 * This is stuff we need to have available at fw load time
 		 * if we are planning to enable submission later
 		 */
-		ret = i915_guc_submission_init(dev_priv);
+		ret = intel_guc_submission_init(guc);
 		if (ret)
 			goto err_guc;
drivers/gpu/drm/i915/intel_uc.c +2 -2
 	}
@@ -217,7 +217,7 @@ int intel_uc_init_hw(struct drm_i915_private  
 *dev_priv)
 		if (i915_modparams.guc_log_level >= 0)
 			gen9_enable_guc_interrupts(dev_priv);
-		ret = i915_guc_submission_enable(dev_priv);
+		ret = intel_guc_submission_enable(guc);
 		if (ret)
 			goto err_interrupts;
 	}
@@ -246,7 +246,7 @@ int intel_uc_init_hw(struct drm_i915_private  
 *dev_priv)
 	guc_capture_load_err_log(guc);
 err_submission:
 	if (i915_modparams.enable_guc_submission)
-		i915_guc_submission_fini(dev_priv);
+		intel_guc_submission_fini(guc);
 err_guc:
 	i915_ggtt_disable_guc(dev_priv);

drivers/gpu/drm/i915/intel_uc.c void intel_uc_fini_hw(struct drm_i915_private · line 284

Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +2 -2
@@ -277,13 +277,13 @@ void intel_uc_fini_hw(struct drm_i915_private  
 *dev_priv)
 		return;
 	if (i915_modparams.enable_guc_submission)
-		i915_guc_submission_disable(dev_priv);
+		intel_guc_submission_disable(&dev_priv->guc);
 	guc_disable_communication(&dev_priv->guc);
 	if (i915_modparams.enable_guc_submission) {
 		gen9_disable_guc_interrupts(dev_priv);
-		i915_guc_submission_fini(dev_priv);
+		intel_guc_submission_fini(&dev_priv->guc);

Better to declare local variable guc and use them in all places.

drivers/gpu/drm/i915/intel_uc.c void intel_uc_fini_hw(struct drm_i915_private *dev_priv) · line 289

Quoted 2 lines
drivers/gpu/drm/i915/intel_uc.c +0 -0
 	}
 	i915_ggtt_disable_guc(dev_priv);

Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoting Michal Wajdeczko (2017-11-14 12:23:18)

Quoted 5 lines

On Mon, 13 Nov 2017 09:48:11 +0100, Sagar Arun Kamble

drivers/gpu/drm/i915/i915_guc_submission.c static void guc_interrupts_release(struct drm_i915_private *dev_priv) · line 1386

Quoted 2 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-static void i915_guc_submission_unpark(struct intel_engine_cs *engine)
+static void intel_guc_submission_unpark(struct intel_engine_cs *engine)

Both park/unpark are also static and do not require "intel" prefix.

Hooks are an interesting one, because they are exported via the vfuncs even though they are static. Here, the export is onto to other i915 functions so it is reasonably clear, but if we export a vfunc further afield having the intel_ prefix is useful to mark the boundary into our module.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoted 7 lines · Chris Wilson

Quoting Michal Wajdeczko (2017-11-14 12:23:18)

Quoted 6 lines

On Mon, 13 Nov 2017 09:48:11 +0100, Sagar Arun Kamble

Quoted 1 line

-static void i915_guc_submission_unpark(struct intel_engine_cs

*engine)

Quoted 1 line

+static void intel_guc_submission_unpark(struct intel_engine_cs

*engine)

Quoted 7 lines
Quoted 1 line

Both park/unpark are also static and do not require "intel" prefix.

Hooks are an interesting one, because they are exported via the vfuncs even though they are static. Here, the export is onto to other i915 functions so it is reasonably clear, but if we export a vfunc further afield having the intel_ prefix is useful to mark the boundary into our module.

Note that our boundary is already visible/available when using %pF format. See some examples below:

[   98.279612]  i915_init+0x6b/0x6e [i915]
                                     ^^^^
[   67.109688] [drm:intel_device_info_dump [i915]] ...
                                            ^^^^

-Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoting Michal Wajdeczko (2017-11-14 14:54:09)

Quoted 18 lines
Quoted 7 lines · Chris Wilson

Quoting Michal Wajdeczko (2017-11-14 12:23:18)

Quoted 6 lines

On Mon, 13 Nov 2017 09:48:11 +0100, Sagar Arun Kamble

Quoted 1 line

-static void i915_guc_submission_unpark(struct intel_engine_cs

*engine)

Quoted 1 line

+static void intel_guc_submission_unpark(struct intel_engine_cs

*engine)

Quoted 7 lines
Quoted 1 line

Both park/unpark are also static and do not require "intel" prefix.

Hooks are an interesting one, because they are exported via the vfuncs even though they are static. Here, the export is onto to other i915 functions so it is reasonably clear, but if we export a vfunc further afield having the intel_ prefix is useful to mark the boundary into our module.

Quoted 7 lines

Note that our boundary is already visible/available when using %pF format. See some examples below:

[   98.279612]  i915_init+0x6b/0x6e [i915]
                                      ^^^^
[   67.109688] [drm:intel_device_info_dump [i915]] ...
                                             ^^^^

True. I shall keep my comments to userspace then ;) -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

In reply to Michal Wajdeczko
Quoted 27 lines · Michal Wajdeczko
Quoted 25 lines · Sagar Arun Kamble

i915 GuC submission is hardware interface and GuC APIs that are not user facing should be named intel_guc* hence we change GuC submission related functions name prefix to intel_guc. Also changed the parameter to these functions to intel_guc struct.

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>

---
 drivers/gpu/drm/i915/i915_guc_submission.c | 39
++++++++++++++----------------
 drivers/gpu/drm/i915/i915_guc_submission.h |  8 +++--- drivers/gpu/drm/i915/intel_uc.c            | 10 ++++----

 3 files changed, 27 insertions(+), 30 deletions(-)
Quoted 16 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_guc_submission.c +0 -0
index 0ba2fc0..42dc5b4 100644

drivers/gpu/drm/i915/i915_guc_submission.c static void wait_for_guc_preempt_report(struct · line 690

Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -683,13 +683,13 @@ static void wait_for_guc_preempt_report(struct 
 intel_engine_cs *engine)
  }
 /**
- * i915_guc_submit() - Submit commands through GuC
+ * intel_guc_submit() - Submit commands through GuC
   * @engine: engine associated with the commands
   *
   * The only error here arises if the doorbell hardware isn't functioning
   * as expected, which really shouln't happen.

                                ^
While here, please fix this old typo.

Yes.

Quoted 11 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void wait_for_guc_preempt_report(struct intel_engine_cs *engine) · line 692

Quoted 4 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
   */
-static void i915_guc_submit(struct intel_engine_cs *engine)
+static void intel_guc_submit(struct intel_engine_cs *engine)

Hmm, this is static function and neither old or new name looks good or correct as function takes engine as parameter not guc.

What about plain and simple "submit_through_guc(engine)" ? Or more formal "engine_submit_through_guc(engine)" ?

How about "guc_submit(engine)" & "guc_dequeue(engine)" vis-a-vis "execlists_submit_ports" & "execlists_dequeue" I think  ports are not visible with GuC hence we may not say guc_submit_ports. agree?

Quoted 21 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void port_assign(struct execlist_port *port, · line 724

Quoted 8 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
  {
      struct intel_guc *guc = &engine->i915->guc;
      struct intel_engine_execlists * const execlists = &engine->execlists;
@@ -722,7 +722,7 @@ static void port_assign(struct execlist_port *port,
      port_set(port, port_pack(i915_gem_request_get(rq), port_count(port)));
  }
-static void i915_guc_dequeue(struct intel_engine_cs *engine)
+static void intel_guc_dequeue(struct intel_engine_cs *engine)

and then matching "dequeue_and_submit(engine)"

Quoted 10 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
  {
      struct intel_engine_execlists * const execlists = &engine->execlists;
      struct execlist_port *port = execlists->port;
@@ -793,13 +793,13 @@ static void i915_guc_dequeue(struct 
 intel_engine_cs *engine)
      if (submit) {
          port_assign(port, last);
          execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
-        i915_guc_submit(engine);
+        intel_guc_submit(engine);
Quoted 9 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_dequeue(struct intel_engine_cs *engine) · line 802

Quoted 6 lines
drivers/gpu/drm/i915/i915_guc_submission.c +0 -0
      }

 unlock:
     spin_unlock_irq(&engine->timeline->lock);
 }

drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Yes. Should we rename irq_tasklet to submission_tasklet?
then we can s/intel_lrc_irq_handler/execlists_submission_tasklet and s/i915_guc_irq_handler/guc_submission_tasklet.
Again trying to maintain the nomenclature consistency for Execlists and GuC.

Quoted 45 lines
Quoted 45 lines

 {
     struct intel_engine_cs * const engine = (struct intel_engine_cs *)data; struct intel_engine_execlists * const execlists = &engine->execlists;

drivers/gpu/drm/i915/i915_guc_submission.c +4 -8
@@ -831,13 +831,13 @@ static void i915_guc_irq_handler(unsigned long 
 data)
      }
     if (!execlists_is_active(execlists, EXECLISTS_ACTIVE_PREEMPT))
-        i915_guc_dequeue(engine);
+        intel_guc_dequeue(engine);
  }
 /*
   * Everything below here is concerned with setup & teardown, and is
   * therefore not part of the somewhat time-critical batch-submission
- * path of i915_guc_submit() above.
+ * path of intel_guc_submit() above.
   */
 /* Check that a doorbell register is in the expected state */
@@ -1253,9 +1253,8 @@ static void guc_preempt_work_destroy(struct 
 intel_guc *guc)
   * Set up the memory resources to be shared with the GuC (via the GGTT)
   * at firmware loading time.
   */
-int i915_guc_submission_init(struct drm_i915_private *dev_priv)
+int intel_guc_submission_init(struct intel_guc *guc)
  {
-    struct intel_guc *guc = &dev_priv->guc;
      int ret;
     if (guc->stage_desc_pool)
@@ -1302,10 +1301,8 @@ int i915_guc_submission_init(struct 
 drm_i915_private *dev_priv)
      return ret;
  }
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
+void intel_guc_submission_fini(struct intel_guc *guc)
  {
-    struct intel_guc *guc = &dev_priv->guc;
-
      guc_ads_destroy(guc);
      guc_preempt_work_destroy(guc);
      intel_guc_log_destroy(guc);
@@ -1381,19 +1378,19 @@ static void guc_interrupts_release(struct 
 drm_i915_private *dev_priv)
      rps->pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK;
  }
-static void i915_guc_submission_park(struct intel_engine_cs *engine)
Quoted 9 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void guc_interrupts_release(struct drm_i915_private *dev_priv) · line 1386

Quoted 6 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -1
+static void intel_guc_submission_park(struct intel_engine_cs *engine)
  {
      intel_engine_unpin_breadcrumbs_irq(engine);
  }
-static void i915_guc_submission_unpark(struct intel_engine_cs *engine)
+static void intel_guc_submission_unpark(struct intel_engine_cs *engine)

Both park/unpark are also static and do not require "intel" prefix.

Yes.

Quoted 93 lines
Quoted 12 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
  {
      intel_engine_pin_breadcrumbs_irq(engine);
  }
-int i915_guc_submission_enable(struct drm_i915_private *dev_priv)
+int intel_guc_submission_enable(struct intel_guc *guc)
  {
-    struct intel_guc *guc = &dev_priv->guc;
+    struct drm_i915_private *dev_priv = guc_to_i915(guc);
      struct intel_engine_cs *engine;
      enum intel_engine_id id;
      int err;

drivers/gpu/drm/i915/i915_guc_submission.c int i915_guc_submission_enable(struct · line 1441

Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_submission.c +3 -3
@@ -1439,9 +1436,9 @@ int i915_guc_submission_enable(struct 
 drm_i915_private *dev_priv)
     for_each_engine(engine, dev_priv, id) {
          struct intel_engine_execlists * const execlists = &engine->execlists;
-        execlists->irq_tasklet.func = i915_guc_irq_handler;
-        engine->park = i915_guc_submission_park;
-        engine->unpark = i915_guc_submission_unpark;
+        execlists->irq_tasklet.func = intel_guc_irq_handler;
+        engine->park = intel_guc_submission_park;
+        engine->unpark = intel_guc_submission_unpark;

Then we'll have:

    execlists->irq_tasklet.func = guc_submission_handler; engine->park = guc_submission_park; engine->unpark = guc_submission_unpark;

Quoted 65 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
      }
     return 0;
@@ -1451,9 +1448,9 @@ int i915_guc_submission_enable(struct 
 drm_i915_private *dev_priv)
      return err;
  }
-void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
+void intel_guc_submission_disable(struct intel_guc *guc)
  {
-    struct intel_guc *guc = &dev_priv->guc;
+    struct drm_i915_private *dev_priv = guc_to_i915(guc);

    GEM_BUG_ON(dev_priv->gt.awake); /* GT should be parked first */

drivers/gpu/drm/i915/i915_guc_submission.h +4 -4
index cb4353b..6bdb8fc 100644
@@ -72,9 +72,9 @@ struct i915_guc_client {
      u64 submissions[I915_NUM_ENGINES];
  };
-int i915_guc_submission_init(struct drm_i915_private *dev_priv);
-int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+int intel_guc_submission_init(struct intel_guc *guc);
+int intel_guc_submission_enable(struct intel_guc *guc);
+void intel_guc_submission_disable(struct intel_guc *guc);
+void intel_guc_submission_fini(struct intel_guc *guc);
 #endif
drivers/gpu/drm/i915/intel_uc.c +1 -1
index aec2954..775db48 100644
@@ -168,7 +168,7 @@ int intel_uc_init_hw(struct drm_i915_private 
 *dev_priv)
           * This is stuff we need to have available at fw load time
           * if we are planning to enable submission later
           */
-        ret = i915_guc_submission_init(dev_priv);
+        ret = intel_guc_submission_init(guc);
          if (ret)
              goto err_guc;

     }

drivers/gpu/drm/i915/intel_uc.c +1 -1
@@ -217,7 +217,7 @@ int intel_uc_init_hw(struct drm_i915_private 
 *dev_priv)
          if (i915_modparams.guc_log_level >= 0)
              gen9_enable_guc_interrupts(dev_priv);
-        ret = i915_guc_submission_enable(dev_priv);
+        ret = intel_guc_submission_enable(guc);
          if (ret)
              goto err_interrupts;
      }
@@ -246,7 +246,7 @@ int intel_uc_init_hw(struct drm_i915_private 
 *dev_priv)
      guc_capture_load_err_log(guc);

 err_submission:
     if (i915_modparams.enable_guc_submission)
-        i915_guc_submission_fini(dev_priv);
+        intel_guc_submission_fini(guc);
 err_guc:
     i915_ggtt_disable_guc(dev_priv);

drivers/gpu/drm/i915/intel_uc.c +0 -1
@@ -277,13 +277,13 @@ void intel_uc_fini_hw(struct drm_i915_private 
 *dev_priv)
          return;
     if (i915_modparams.enable_guc_submission)
-        i915_guc_submission_disable(dev_priv);
Quoted 8 lines

drivers/gpu/drm/i915/intel_uc.c void intel_uc_fini_hw(struct drm_i915_private *dev_priv) · line 286

Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.c +2 -1
+        intel_guc_submission_disable(&dev_priv->guc);
     guc_disable_communication(&dev_priv->guc);
     if (i915_modparams.enable_guc_submission) {
          gen9_disable_guc_interrupts(dev_priv);
-        i915_guc_submission_fini(dev_priv);
+        intel_guc_submission_fini(&dev_priv->guc);

Better to declare local variable guc and use them in all places.

Yes.

Quoted 5 lines

drivers/gpu/drm/i915/intel_uc.c void intel_uc_fini_hw(struct drm_i915_private *dev_priv) · line 289

Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.c +0 -0
      }
     i915_ggtt_disable_guc(dev_priv);

Michal

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoting Sagar Arun Kamble (2017-11-14 18:19:01)

Quoted 10 lines · Michal Wajdeczko
Quoted 7 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_dequeue(struct intel_engine_cs *engine) · line 802

Quoted 2 lines · Sagar Arun Kamble
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Quoted 4 lines

Yes. Should we rename irq_tasklet to submission_tasklet?
then we can s/intel_lrc_irq_handler/execlists_submission_tasklet and s/i915_guc_irq_handler/guc_submission_tasklet.
Again trying to maintain the nomenclature consistency for Execlists and GuC.

Ok. Do that as a separate (initial) step.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoted 11 lines · Chris Wilson

Quoting Sagar Arun Kamble (2017-11-14 18:19:01)

Quoted 10 lines · Michal Wajdeczko
Quoted 7 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_dequeue(struct intel_engine_cs *engine) · line 802

Quoted 2 lines · Sagar Arun Kamble
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Quoted 6 lines
Quoted 4 lines

Yes. Should we rename irq_tasklet to submission_tasklet?
then we can s/intel_lrc_irq_handler/execlists_submission_tasklet and s/i915_guc_irq_handler/guc_submission_tasklet.
Again trying to maintain the nomenclature consistency for Execlists and GuC.

Ok. Do that as a separate (initial) step.

Hmm. By "tasklet" I usually think of "tasklet_struct". Then "guc_submission_tasklet" suggests that this is another kind or customized "tasklet" struct. So maybe use full name:

s/i915_guc_irq_handler/guc_submission_tasklet_func ?
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoting Michal Wajdeczko (2017-11-14 19:23:24)

Quoted 20 lines
Quoted 17 lines · Chris Wilson

Quoting Sagar Arun Kamble (2017-11-14 18:19:01)

Quoted 15 lines · Michal Wajdeczko
Quoted 7 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_dequeue(struct intel_engine_cs *engine) · line 802

Quoted 2 lines · Sagar Arun Kamble
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Yes. Should we rename irq_tasklet to submission_tasklet? then we can s/intel_lrc_irq_handler/execlists_submission_tasklet and s/i915_guc_irq_handler/guc_submission_tasklet.
Again trying to maintain the nomenclature consistency for Execlists and GuC.

Quoted 7 lines
Quoted 1 line

Ok. Do that as a separate (initial) step.

Hmm. By "tasklet" I usually think of "tasklet_struct". Then "guc_submission_tasklet" suggests that this is another kind or customized "tasklet" struct. So maybe use full name:

s/i915_guc_irq_handler/guc_submission_tasklet_func ?

Please no. You'll grow to dislike the tautology immensely!

struct tasklet tasklet;

execlists->tasklet = execlists_submission_tasklet; execlists->tasklet = guc_submission_tasklet;

tasklet_schedule(engine->execlists.tasklet) etc

is clear to me.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoted 23 lines · Chris Wilson

Quoting Michal Wajdeczko (2017-11-14 19:23:24)

Quoted 22 lines
Quoted 9 lines · Chris Wilson

Quoting Sagar Arun Kamble (2017-11-14 18:19:01)

Quoted 8 lines · Michal Wajdeczko
Quoted 6 lines

drivers/gpu/drm/i915/i915_guc_submission.c static void i915_guc_dequeue(struct intel_engine_cs *engine) · line 802

Quoted 2 lines · Sagar Arun Kamble
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Quoted 6 lines
Quoted 5 lines

Yes. Should we rename irq_tasklet to submission_tasklet? then we can s/intel_lrc_irq_handler/execlists_submission_tasklet and s/i915_guc_irq_handler/guc_submission_tasklet.
Again trying to maintain the nomenclature consistency for Execlists and GuC.

Ok. Do that as a separate (initial) step.

Hmm. By "tasklet" I usually think of "tasklet_struct". Then "guc_submission_tasklet" suggests that this is another kind or customized "tasklet" struct. So maybe use full name:

Quoted 6 lines
Quoted 1 line

s/i915_guc_irq_handler/guc_submission_tasklet_func ?

Please no. You'll grow to dislike the tautology immensely!

struct tasklet tasklet;

execlists->tasklet = execlists_submission_tasklet;

You meant "execlists->tasklet.func =" here right?

Quoted 6 lines

execlists->tasklet = guc_submission_tasklet;

tasklet_schedule(engine->execlists.tasklet) etc

is clear to me.
-Chris

Michal wanted to distinguish tasklet func from tasklet.
I thought of naming vfunc as submission_tasklet and component functions as execlists/guc_submission_tasklet_func (with michal suggestion). But that is looking little big i guess.
With Michal's initial suggestion how about below change? (irq_tasklet was little misleading for me)

struct tasklet tasklet;

execlists->tasklet.func = execlists_submission_handler; execlists->tasklet.func = guc_submission_handler;

tasklet_schedule(engine->execlists.tasklet)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

Re: [PATCH 1/4] drm/i915/guc: Update name and prototype of GuC submission related functions

Quoting Sagar Arun Kamble (2017-11-14 19:47:05)

Quoted 32 lines · Chris Wilson
Quoted 23 lines

Quoting Michal Wajdeczko (2017-11-14 19:23:24)

Quoted 22 lines
Quoted 9 lines · Chris Wilson

Quoting Sagar Arun Kamble (2017-11-14 18:19:01)

Quoted 8 lines · Michal Wajdeczko
Quoted 6 lines

Review

Quoted 2 lines · Sagar Arun Kamble
(quoted diff) +1 -1
-static void i915_guc_irq_handler(unsigned long data)
+static void intel_guc_irq_handler(unsigned long data)

and verbose "guc_submission_handler()" ?

Quoted 6 lines
Quoted 5 lines

Yes. Should we rename irq_tasklet to submission_tasklet? then we can s/intel_lrc_irq_handler/execlists_submission_tasklet and s/i915_guc_irq_handler/guc_submission_tasklet.
Again trying to maintain the nomenclature consistency for Execlists and GuC.

Ok. Do that as a separate (initial) step.

Hmm. By "tasklet" I usually think of "tasklet_struct". Then "guc_submission_tasklet" suggests that this is another kind or customized "tasklet" struct. So maybe use full name:

Quoted 6 lines
Quoted 1 line

s/i915_guc_irq_handler/guc_submission_tasklet_func ?

Please no. You'll grow to dislike the tautology immensely!

struct tasklet tasklet;

execlists->tasklet = execlists_submission_tasklet;

Quoted 8 lines

You meant "execlists->tasklet.func =" here right?

Quoted 6 lines

execlists->tasklet = guc_submission_tasklet;

tasklet_schedule(engine->execlists.tasklet) etc

is clear to me.
-Chris

Michal wanted to distinguish tasklet func from tasklet.

I don't see the point as I don't find any confusion between a struct and a function. The tasklet is the function; struct tasklet is merely its integration to softirq.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw

PATCH 2/4 drm/i915/guc: Rename i915_guc_client struct to intel_guc_client

In reply to Sagar Arun Kamble

GuC submission clients are currently being used in kernel only hence update the structure name to intel_guc_client.

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c        |  4 +-
 drivers/gpu/drm/i915/i915_guc_submission.c | 62 +++++++++++++++---------------
 drivers/gpu/drm/i915/i915_guc_submission.h |  2 +-
 drivers/gpu/drm/i915/intel_guc.h           |  6 +--
 4 files changed, 37 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
index 533ba09..d3c756b 100644
@@ -2433,7 +2433,7 @@ static void i915_guc_log_info(struct seq_file *m,
 
 static void i915_guc_client_info(struct seq_file *m,
 				 struct drm_i915_private *dev_priv,
-				 struct i915_guc_client *client)
+				 struct intel_guc_client *client)
 {
 	struct intel_engine_cs *engine;
 	enum intel_engine_id id;
@@ -2498,7 +2498,7 @@ static int i915_guc_stage_pool(struct seq_file *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	const struct intel_guc *guc = &dev_priv->guc;
 	struct guc_stage_desc *desc = guc->stage_desc_pool_vaddr;
-	struct i915_guc_client *client = guc->execbuf_client;
+	struct intel_guc_client *client = guc->execbuf_client;
 	unsigned int tmp;
 	int index;
 
drivers/gpu/drm/i915/i915_guc_submission.c +31 -31

239 lines not on this page · raw message

drivers/gpu/drm/i915/i915_guc_submission.h +1 -1
index 6bdb8fc..f8ae258 100644
@@ -52,7 +52,7 @@
  * queue (a circular array of work items), again described in the process
  * descriptor. Work queue pages are mapped momentarily as required.
  */
-struct i915_guc_client {
+struct intel_guc_client {
 	struct i915_vma *vma;
 	void *vaddr;
 	struct i915_gem_context *owner;
drivers/gpu/drm/i915/intel_guc.h +3 -3
index 607e025..75c4cfe 100644
@@ -41,7 +41,7 @@ struct guc_preempt_work {
 
 /*
  * Top level structure of GuC. It handles firmware loading and manages client
- * pool and doorbells. intel_guc owns a i915_guc_client to replace the legacy
+ * pool and doorbells. intel_guc owns a intel_guc_client to replace the legacy
  * ExecList submission.
  */
 struct intel_guc {
@@ -62,8 +62,8 @@ struct intel_guc {
 	struct i915_vma *shared_data;
 	void *shared_data_vaddr;
 
-	struct i915_guc_client *execbuf_client;
-	struct i915_guc_client *preempt_client;
+	struct intel_guc_client *execbuf_client;
+	struct intel_guc_client *preempt_client;
 
 	struct guc_preempt_work preempt_work[I915_NUM_ENGINES];
 	struct workqueue_struct *preempt_wq;
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/4
#13 lore raw

Re: [PATCH 2/4] drm/i915/guc: Rename i915_guc_client struct to intel_guc_client

Quoted 15 lines · Sagar Arun Kamble

GuC submission clients are currently being used in kernel only hence update the structure name to intel_guc_client.

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Quoted 1 line

---

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw

PATCH 3/4 drm/i915/guc: Rename i915_guc_submission.c|h to intel_guc_submission.c|h

In reply to Sagar Arun Kamble

With all component structures and functions named as intel_guc*, change the names of GuC submission source files. There were bunch of style issues in guc_submission.c that are highlighted now by checkpatch. Fix those. Update name in Documentation/gpu. (Joonas)

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
---
 Documentation/gpu/i915.rst                  |    4 +-
 drivers/gpu/drm/i915/Makefile               |    4 +-
 drivers/gpu/drm/i915/i915_debugfs.c         |    2 +-
 drivers/gpu/drm/i915/i915_guc_submission.c  | 1463 --------------------------
 drivers/gpu/drm/i915/i915_guc_submission.h  |   80 --
 drivers/gpu/drm/i915/intel_guc.c            |    2 +-
 drivers/gpu/drm/i915/intel_guc_submission.c | 1477 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc_submission.h |   81 ++
 drivers/gpu/drm/i915/intel_uc.c             |    2 +-
 9 files changed, 1565 insertions(+), 1550 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c
 delete mode 100644 drivers/gpu/drm/i915/i915_guc_submission.h
 create mode 100644 drivers/gpu/drm/i915/intel_guc_submission.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc_submission.h
Documentation/gpu/i915.rst +2 -2
index 2e7ee03..21577ea 100644
@@ -350,10 +350,10 @@ GuC-specific firmware loader
 GuC-based command submission
 ----------------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c
    :doc: GuC-based command submission
 
-.. kernel-doc:: drivers/gpu/drm/i915/i915_guc_submission.c
+.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c
    :internal:
 
 GuC Firmware Layout
drivers/gpu/drm/i915/Makefile +2 -2
index 1774044..9469c37 100644
@@ -83,10 +83,10 @@ i915-y += intel_uc.o \
 	  intel_uc_fw.o \
 	  intel_guc.o \
 	  intel_guc_ct.o \
-	  intel_guc_log.o \
 	  intel_guc_fw.o \
+	  intel_guc_log.o \
+	  intel_guc_submission.o \
 	  intel_huc.o \
-	  i915_guc_submission.o
 
 # autogenerated null render state
 i915-y += intel_renderstate_gen6.o \
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
index d3c756b..d856b61 100644
@@ -30,7 +30,7 @@
 #include <linux/sort.h>
 #include <linux/sched/mm.h>
 #include "intel_drv.h"
-#include "i915_guc_submission.h"
+#include "intel_guc_submission.h"
 
 static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
 {
drivers/gpu/drm/i915/i915_guc_submission.c deleted +0 -1463

1,463 lines not on this page · raw message

drivers/gpu/drm/i915/i915_guc_submission.h deleted +0 -80

80 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.c +1 -1
index 9678630..823d0c2 100644
@@ -23,8 +23,8 @@
  */
 
 #include "intel_guc.h"
+#include "intel_guc_submission.h"
 #include "i915_drv.h"
-#include "i915_guc_submission.h"
 
 static void gen8_guc_raise_irq(struct intel_guc *guc)
 {
drivers/gpu/drm/i915/intel_guc_submission.c new file +1477 -0

1,416 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc_submission.h new file +81 -0

81 lines not on this page · raw message

drivers/gpu/drm/i915/intel_uc.c +1 -1
index 775db48..e85b268 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Part of the diff is not shown here. View the raw message.

Reviewed-by on v1 3/4
#15 lore raw

Re: [PATCH 3/4] drm/i915/guc: Rename i915_guc_submission.c|h to intel_guc_submission.c|h

Quoted 17 lines · Sagar Arun Kamble

With all component structures and functions named as intel_guc*, change the names of GuC submission source files. There were bunch of style issues in guc_submission.c that are highlighted now by checkpatch. Fix those. Update name in Documentation/gpu. (Joonas)

Cc Michal Wajdeczko <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Arkadiusz Hiler <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Tvrtko Ursulin <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Quoted 1 line

---

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw

PATCH 4/4 HAX enable GuC submission for CI

In reply to Sagar Arun Kamble

Also revert ("drm/i915/guc: Assert that we switch between known ggtt->invalidate functions")

---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++------
 drivers/gpu/drm/i915/i915_params.h  | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -6
index 1e40eeb..8f9e7cf 100644
@@ -3563,17 +3563,13 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)
 
 void i915_ggtt_enable_guc(struct drm_i915_private *i915)
 {
-	GEM_BUG_ON(i915->ggtt.invalidate != gen6_ggtt_invalidate);
-
 	i915->ggtt.invalidate = guc_ggtt_invalidate;
 }
 
 void i915_ggtt_disable_guc(struct drm_i915_private *i915)
 {
-	/* We should only be called after i915_ggtt_enable_guc() */
-	GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
-
-	i915->ggtt.invalidate = gen6_ggtt_invalidate;
+	if (i915->ggtt.invalidate == guc_ggtt_invalidate)
+		i915->ggtt.invalidate = gen6_ggtt_invalidate;
 }
 
 void i915_gem_restore_gtt_mappings(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_params.h +2 -2
index c729226..c38cef0 100644
@@ -44,8 +44,8 @@
 	param(int, disable_power_well, -1) \
 	param(int, enable_ips, 1) \
 	param(int, invert_brightness, 0) \
-	param(int, enable_guc_loading, 0) \
-	param(int, enable_guc_submission, 0) \
+	param(int, enable_guc_loading, 1) \
+	param(int, enable_guc_submission, 1) \
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#17 lore raw

✗ Fi.CI.BAT: failure for GuC submission functions/struct name/prototype update

In reply to Sagar Arun Kamble
== Series Details ==

== Series Details ==

Series: GuC submission functions/struct name/prototype update
URL : https://patchwork.freedesktop.org/series/33679/
State : failure

== Summary ==

Series 33679v1 GuC submission functions/struct name/prototype update
https://patchwork.freedesktop.org/api/1.0/series/33679/revisions/1/mbox/

Test chamelium:

        Subgroup dp-edid-read:
                incomplete -> PASS       (fi-kbl-7500u) fdo#102672
Test gem_exec_suspend:
        Subgroup basic-s3:
                pass       -> FAIL       (fi-kbl-7560u) fdo#103039
                pass       -> FAIL       (fi-kbl-7567u) fdo#102846 +12
        Subgroup basic-s4-devices:
                pass       -> FAIL       (fi-bxt-dsi)
Test kms_busy:
        Subgroup basic-flip-a:
                pass       -> FAIL       (fi-bwr-2160)
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                fail       -> PASS       (fi-gdg-551) fdo#102618
Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> SKIP       (fi-ivb-3520m)
        Subgroup force-edid:
                pass       -> SKIP       (fi-ivb-3520m)
        Subgroup force-load-detect:
                pass       -> SKIP       (fi-ivb-3520m)
        Subgroup prune-stale-modes:
                pass       -> SKIP       (fi-ivb-3520m)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-bxt-dsi)
                pass       -> DMESG-WARN (fi-bxt-j4205)
        Subgroup suspend-read-crc-pipe-b:
                pass       -> DMESG-FAIL (fi-bxt-dsi)
                pass       -> DMESG-FAIL (fi-bxt-j4205)
        Subgroup suspend-read-crc-pipe-c:
                pass       -> DMESG-FAIL (fi-bxt-dsi) fdo#103524
                pass       -> DMESG-FAIL (fi-bxt-j4205)
Test kms_psr_sink_crc:
        Subgroup psr_basic:
                pass       -> DMESG-WARN (fi-kbl-7560u)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> FAIL       (fi-bxt-dsi)
                pass       -> FAIL       (fi-bxt-j4205)
                pass       -> FAIL       (fi-kbl-7560u)
                pass       -> FAIL       (fi-kbl-7567u)
                pass       -> FAIL       (fi-kbl-r)
        Subgroup basic-rte:
                pass       -> FAIL       (fi-bxt-dsi)
                pass       -> FAIL       (fi-bxt-j4205)
                pass       -> FAIL       (fi-kbl-7560u)
                pass       -> FAIL       (fi-kbl-7567u)
                pass       -> FAIL       (fi-kbl-r)
Test pm_rps:
        Subgroup basic-api:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
Test prime_busy:
        Subgroup basic-after-default:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
        Subgroup basic-before-default:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
        Subgroup basic-wait-after-default:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
        Subgroup basic-wait-before-default:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
Test prime_vgem:
        Subgroup basic-busy-default:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
        Subgroup basic-fence-flip:
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7567u) fdo#103165 +1
        Subgroup basic-fence-mmap:
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-kbl-7560u)
                pass       -> SKIP       (fi-kbl-r)

WARNING: Long output truncated

0dc48f1fad834c3ab95f4d178e9e38e6ea39b6cf drm-tip: 2017y-11m-12d-14h-36m-14s UTC integration manifest 029647b760a7 HAX enable GuC submission for CI
f95651f02ab6 drm/i915/guc: Rename i915_guc_submission.c|h to intel_guc_submission.c|h f945cfe33b68 drm/i915/guc: Rename i915_guc_client struct to intel_guc_client 6d7d9c92dd33 drm/i915/guc: Update name and prototype of GuC submission related functions

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7086/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#18 lore raw

Re: ✗ Fi.CI.BAT: failure for GuC submission functions/struct name/prototype update

Quoting Patchwork (2017-11-13 09:23:47)

Quoted 11 lines

== Series Details ==

Series: GuC submission functions/struct name/prototype update
URL : https://patchwork.freedesktop.org/series/33679/
State : failure

== Summary ==

Series 33679v1 GuC submission functions/struct name/prototype update
https://patchwork.freedesktop.org/api/1.0/series/33679/revisions/1/mbox/

Quoted 7 lines

Test chamelium:

        Subgroup dp-edid-read:
                incomplete -> PASS       (fi-kbl-7500u) fdo#102672
Test gem_exec_suspend:
        Subgroup basic-s3:
                pass       -> FAIL       (fi-kbl-7560u) fdo#103039
                pass       -> FAIL       (fi-kbl-7567u) fdo#102846 +12

... You probably want intel_guc_resume() before i915_gem_resume().... -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx