drm/i915/guc : Removing enable_guc_loading module and Decoupling logs and ADS from submission
Subsystems (2)
v6 cover drm/i915/guc : Removing enable_guc_loading module and Decoupling logs and ADS from submission
The first patch simply unifies different seq_puts messages found in debugfs. Patch 2 focuses on replacing the enable_guc_loading module. Patch 3 deals with decoupling guc logs and ADS from submission.
Sujaritha Sundaresan (3):
drm/i915/guc : Unifying seq_puts messages for feature support drm/i915/guc : Removing i915_modparams.enable_guc_loading module parameter drm/i915/guc : Decouple logs and ADS from submission
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 18 +++-- drivers/gpu/drm/i915/i915_drv.h | 9 ++- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 105 +------------------------ drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 4 - drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_guc.h | 3 +- drivers/gpu/drm/i915/intel_guc_ads.c | 120 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_ads.h | 31 ++++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 9 +-- drivers/gpu/drm/i915/intel_guc_log.c | 6 +- drivers/gpu/drm/i915/intel_huc.c | 4 +- drivers/gpu/drm/i915/intel_uc.c | 112 ++++++++++++++++++--------- drivers/gpu/drm/i915/intel_uncore.c | 3 +- 17 files changed, 262 insertions(+), 170 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.c create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.h
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/3 drm/i915/guc : Unifying seq_puts messages for feature support
Unifying the various seq_puts messages in debugfs to the simplest one for feature support.
v2: Clarifying the commit message (Anusha)
v3: Re-factoring code as per review (Michal)
v4: Rebase
v5: Split from following patch
v6: Re-factoring code (Michal, Sagar)
Clarifying commit message (Sagar)
Suggested by: Michal Wajdeczko <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -5
@@ -1670,7 +1670,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)struct drm_i915_private *dev_priv =node_to_i915 (m->private);if (!HAS_FBC (dev_priv)) { -seq_puts (m,"FBC unsupported on this chipset\n" ); +seq_puts (m,"not supported\n" );return 0 ; }
@@ -1837,7 +1837,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)unsigned int max_gpu_freq, min_gpu_freq;if (!HAS_LLC (dev_priv)) { -seq_puts (m,"unsupported on this chipset\n" ); +seq_puts (m,"not supported\n" );return 0 ; }
@@ -2391,6 +2391,7 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;if (!HAS_HUC_UCODE (dev_priv)) +seq_puts (m,"not supported\n" );return 0 ;seq_puts (m,"HuC firmware status:\n" );
@@ -2424,6 +2425,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv)) +seq_puts (m,"not supported\n" );return 0 ;seq_printf (m,"GuC firmware status:\n" );
@@ -2708,7 +2710,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)bool enabled = false;if (!HAS_PSR (dev_priv)) { -seq_puts (m,"PSR not supported\n" ); +seq_puts (m,"not supported\n" );return 0 ; }
@@ -3565,7 +3567,7 @@ static void drrs_status_per_crtc(struct seq_file *m,mutex_lock (&drrs->mutex);/* DRRS Supported */ -seq_puts (m,"\tDRRS Supported: Yes\n" ); +seq_puts (m,"supported\n" );/* disable_drrs() will make drrs->dp NULL */ if (!drrs->dp) {
@@ -3597,7 +3599,7 @@ static void drrs_status_per_crtc(struct seq_file *m,mutex_unlock (&drrs->mutex); }else {/* DRRS not supported. Print the VBT parameter*/ -seq_puts (m,"\tDRRS Supported : No" ); +seq_puts (m,"not supported\n" ); }seq_puts (m,"\n" ); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 1/3] drm/i915/guc : Unifying seq_puts messages for feature support
Keep subject as "drm/i915" as this is generic change. Also I saw i915_runtime_pm_status debugfs output not updated.
Could you please check.
Quoted 81 lines · Sujaritha Sundaresan
Unifying the various
seq_putsmessages in debugfs to the simplest one for feature support.v2: Clarifying the commit message (Anusha)
v3: Re-factoring code as per review (Michal)
v4: Rebase
v5: Split from following patch
v6: Re-factoring code (Michal, Sagar)
Clarifying commit message (Sagar)Suggested by: Michal Wajdeczko <[email protected]>
Signed-off-by Sujaritha Sundaresan <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Oscar Mateo <[email protected]>Cc Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-4@@ -1670,7 +1670,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)struct drm_i915_private *dev_priv =node_to_i915 (m->private);if (!HAS_FBC (dev_priv)) { -seq_puts (m,"FBC unsupported on this chipset\n" ); +seq_puts (m,"not supported\n" );return 0 ; }@@ -1837,7 +1837,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)unsigned int max_gpu_freq, min_gpu_freq;if (!HAS_LLC (dev_priv)) { -seq_puts (m,"unsupported on this chipset\n" ); +seq_puts (m,"not supported\n" );return 0 ; }@@ -2391,6 +2391,7 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;if (!HAS_HUC_UCODE (dev_priv)) +seq_puts (m,"not supported\n" );return 0 ;seq_puts (m,"HuC firmware status:\n" );@@ -2424,6 +2425,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv)) +seq_puts (m,"not supported\n" );return 0 ;seq_printf (m,"GuC firmware status:\n" );@@ -2708,7 +2710,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)bool enabled = false;if (!HAS_PSR (dev_priv)) { -seq_puts (m,"PSR not supported\n" ); +seq_puts (m,"not supported\n" );return 0 ; }@@ -3565,7 +3567,7 @@ static void drrs_status_per_crtc(struct seq_file *m,mutex_lock (&drrs->mutex);/* DRRS Supported */ -seq_puts (m,"\tDRRS Supported: Yes\n" ); +seq_puts (m,"supported\n" );/* disable_drrs() will make drrs->dp NULL */ if (!drrs->dp) {
drivers/gpu/drm/i915/i915_debugfs.c static void drrs_status_per_crtc(struct seq_file *m, · line 3605
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -3597,7 +3599,7 @@ static void drrs_status_per_crtc(struct seq_file *m,mutex_unlock (&drrs->mutex); }else {/* DRRS not supported. Print the VBT parameter*/ -seq_puts (m,"\tDRRS Supported : No" ); +seq_puts (m,"not supported\n" ); }seq_puts (m,"\n" ); }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 1/3] drm/i915/guc : Unifying seq_puts messages for feature support
Quoted 4 lines · Sagar Arun Kamble
Keep subject as "drm/i915" as this is generic change. Also I saw
i915_runtime_pm_statusdebugfs output not updated.Could you please check.
I will change the subject and check the if the output is being updated.
Quoted 76 lines · Sujaritha Sundaresan
Quoted 73 lines
Unifying the various
seq_putsmessages in debugfs to the simplest one for feature support.v2: Clarifying the commit message (Anusha)
v3: Re-factoring code as per review (Michal)
v4: Rebase
v5: Split from following patch
v6: Re-factoring code (Michal, Sagar)
Clarifying commit message (Sagar)Suggested by: Michal Wajdeczko <[email protected]>
Signed-off-by Sujaritha Sundaresan <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Oscar Mateo <[email protected]>Cc Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c| 12 +++++++-----1 file changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1670,7 +1670,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused) struct drm_i915_private *dev_priv = node_to_i915(m->private); if (!HAS_FBC(dev_priv)) { - seq_puts(m, "FBC unsupported on this chipset\n"); + seq_puts(m, "not supported\n"); return 0; } @@ -1837,7 +1837,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)unsigned int
max_gpu_freq,min_gpu_freq;
if (!HAS_LLC(dev_priv)) {
-seq_puts(m, "unsupported on this chipset\n");
+seq_puts(m, "not supported\n");
return 0;
}
@@ -2391,6 +2391,7 @@ static inti915_huc_load_status_info(struct seq_file *m, void *data)structintel_uc_fw*huc_fw=&dev_priv->huc.fw;
if (!HAS_HUC_UCODE(dev_priv))
+seq_puts(m, "not supported\n");
return 0;
seq_puts(m, "HuC firmware status:\n");drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -2424,6 +2425,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) u32 tmp, i; if (!HAS_GUC_UCODE(dev_priv)) + seq_puts(m, "not supported\n"); return 0; seq_printf(m, "GuC firmware status:\n");@@ -2708,7 +2710,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) bool enabled = false; if (!HAS_PSR(dev_priv)) { - seq_puts(m, "PSR not supported\n"); + seq_puts(m, "not supported\n"); return 0; } @@ -3565,7 +3567,7 @@ static void drrs_status_per_crtc(struct seq_file *m,
mutex_lock(&drrs->mutex);
/* DRRS Supported */
-seq_puts(m, "\tDRRS Supported: Yes\n"); +seq_puts(m, "supported\n");
/*disable_drrs()will makedrrs->dpNULL */ if (!drrs->dp) {drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -3597,7 +3599,7 @@ static void drrs_status_per_crtc(struct seq_file *m,
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1mutex_unlock(&drrs->mutex); } else { /* DRRS not supported. Print the VBT parameter*/ - seq_puts(m, "\tDRRS Supported : No"); + seq_puts(m, "not supported\n"); } seq_puts(m, "\n");}
Thanks for the review,
Regards,
Sujaritha
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 1/3] drm/i915/guc : Unifying seq_puts messages for feature support
In reply to Sagar Arun KambleQuoted 5 lines · Sagar Arun Kamble
Keep subject as "drm/i915" as this is generic change. Also I saw
i915_runtime_pm_statusdebugfs output not updated.Could you please check.
I did not change the seq_puts message of i915_runtime_pm_status debugfs since it doesn't fit into the unified "early return" pattern.
Sujaritha
Quoted 75 lines · Sujaritha Sundaresan
Quoted 73 lines
Unifying the various
seq_putsmessages in debugfs to the simplest one for feature support.v2: Clarifying the commit message (Anusha)
v3: Re-factoring code as per review (Michal)
v4: Rebase
v5: Split from following patch
v6: Re-factoring code (Michal, Sagar)
Clarifying commit message (Sagar)Suggested by: Michal Wajdeczko <[email protected]>
Signed-off-by Sujaritha Sundaresan <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Oscar Mateo <[email protected]>Cc Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c| 12 +++++++-----1 file changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1670,7 +1670,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused) struct drm_i915_private *dev_priv = node_to_i915(m->private); if (!HAS_FBC(dev_priv)) { - seq_puts(m, "FBC unsupported on this chipset\n"); + seq_puts(m, "not supported\n"); return 0; } @@ -1837,7 +1837,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)unsigned int
max_gpu_freq,min_gpu_freq;
if (!HAS_LLC(dev_priv)) {
-seq_puts(m, "unsupported on this chipset\n");
+seq_puts(m, "not supported\n");
return 0;
}
@@ -2391,6 +2391,7 @@ static inti915_huc_load_status_info(struct seq_file *m, void *data)structintel_uc_fw*huc_fw=&dev_priv->huc.fw;
if (!HAS_HUC_UCODE(dev_priv))
+seq_puts(m, "not supported\n");
return 0;
seq_puts(m, "HuC firmware status:\n");drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -2424,6 +2425,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) u32 tmp, i; if (!HAS_GUC_UCODE(dev_priv)) + seq_puts(m, "not supported\n"); return 0; seq_printf(m, "GuC firmware status:\n");@@ -2708,7 +2710,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) bool enabled = false; if (!HAS_PSR(dev_priv)) { - seq_puts(m, "PSR not supported\n"); + seq_puts(m, "not supported\n"); return 0; } @@ -3565,7 +3567,7 @@ static void drrs_status_per_crtc(struct seq_file *m,
mutex_lock(&drrs->mutex);
/* DRRS Supported */
-seq_puts(m, "\tDRRS Supported: Yes\n"); +seq_puts(m, "supported\n");
/*disable_drrs()will makedrrs->dpNULL */ if (!drrs->dp) {drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -3597,7 +3599,7 @@ static void drrs_status_per_crtc(struct seq_file *m,
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1mutex_unlock(&drrs->mutex); } else { /* DRRS not supported. Print the VBT parameter*/ - seq_puts(m, "\tDRRS Supported : No"); + seq_puts(m, "not supported\n"); } seq_puts(m, "\n");}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 2/3 drm/i915/guc : Removing i915_modparams.enable_guc_loading module parameter
In reply to Sujaritha SundaresanWe currently have two module parameters that control GuC: "enable_guc_loading" and "enable_guc_submission". Whenever we need i915_modparams.enable_guc_submission=1, we also need enable_guc_loading=1. We also need enable_guc_loading=1 when we want to verify the HuC,
which is every time we have a HuC (but all platforms with HuC have a GuC and viceversa).
v2: Clarifying the commit message (Anusha)
v3: Unify seq_puts messages, Re-factoring code as per review (Michal)
v4: Rebase
v5: Separating message unification into a separate patch
v6: Re-factoring code (Sagar, Michal)
Rebase
Suggested by: Oscar Mateo <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 6 +-- drivers/gpu/drm/i915/i915_drv.h | 9 +++-- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 4 -- drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_guc.h | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 9 ++--- drivers/gpu/drm/i915/intel_huc.c | 4 +- drivers/gpu/drm/i915/intel_uc.c | 72 +++++++++++++++++---------------- drivers/gpu/drm/i915/intel_uncore.c | 3 +- 12 files changed, 59 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
@@ -2390,7 +2390,7 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; -if (!HAS_HUC_UCODE (dev_priv)) +if (!HAS_GUC (dev_priv))seq_puts (m,"not supported\n" );return 0 ;
@@ -2424,7 +2424,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;u32 tmp, i; -if (!HAS_GUC_UCODE (dev_priv)) +if (!HAS_GUC (dev_priv))seq_puts (m,"not supported\n" );return 0 ;
@@ -2521,7 +2521,7 @@ static bool check_guc_submission(struct seq_file *m)if (!guc->execbuf_client) {seq_printf (m,"GuC submission %s\n" , -HAS_GUC_SCHED (dev_priv) ? +HAS_GUC (dev_priv) ?"disabled" :"not supported" );return false;
drivers/gpu/drm/i915/i915_drv.h +6 -3
@@ -3182,9 +3182,12 @@ static inline unsigned int i915_sg_segment_size(void)*/ #define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_CT (dev_priv) ((dev_priv)->info.has_guc_ct) -#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) -#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) -#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) +#define HAS_GUC_UCODE (dev_priv) ((dev_priv)->guc.fw.path != NULL) +#define HAS_HUC_UCODE (dev_priv) ((dev_priv)->huc.fw.path != NULL) + +#define NEEDS_GUC_LOADING (dev_priv) \ + (HAS_GUC(dev_priv) && \ + (i915_modparams.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
@@ -314,7 +314,7 @@ static u32 default_desc_template(const struct drm_i915_private *i915,* present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ -if (HAS_GUC (dev_priv) && i915_modparams.enable_guc_loading) +if (NEEDS_GUC_LOADING (dev_priv)) ctx->ggtt_offset_bias =GUC_WOPCM_TOP ;else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -3483,7 +3483,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)* currently don't have any bits spare to pass in this upper * restriction! */ -if (HAS_GUC (dev_priv) && i915_modparams.enable_guc_loading) { +if (NEEDS_GUC_LOADING (dev_priv)) { ggtt->base.total =min_t (u64, ggtt->base.total,GUC_GGTT_TOP ); ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); }
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -4022,7 +4022,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)for (i =0 ; i <MAX_L3_SLICES ; ++i) dev_priv->l3_parity.remap_info[i] =NULL ; -if (HAS_GUC_SCHED (dev_priv)) +if (NEEDS_GUC_LOADING (dev_priv)) dev_priv->pm_guc_events =GEN9_GUC_TO_HOST_INT_EVENT ;/* Let's track the enabled rps events */
drivers/gpu/drm/i915/i915_params.c +0 -4
@@ -162,10 +162,6 @@ struct i915_params i915_modparams __read_mostly = {"(0=use value from vbt [default], 1=low power swing(200mV)," "2=default swing(400mV))"); -i915_param_named_unsafe (enable_guc_loading, int,0400 , -"Enable GuC firmware loading " -"(-1=auto, 0=never [default], 1=if available, 2=required)" ); -i915_param_named_unsafe (enable_guc_submission, int,0400 ,"Enable GuC submission " "(-1=auto, 0=never [default], 1=if available, 2=required)" );
drivers/gpu/drm/i915/i915_params.h +0 -1
@@ -44,7 +44,6 @@ 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, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \
drivers/gpu/drm/i915/intel_guc.h +1 -1
@@ -103,7 +103,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)int intel_guc_resume (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); -int intel_guc_select_fw (struct intel_guc *guc); +void intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_guc_loader.c +4 -5
@@ -380,9 +380,8 @@ int intel_guc_init_hw(struct intel_guc *guc)* intel_guc_select_fw() - selects GuC firmware for loading * @guc: intel_guc struct * -* Return: zero when we know firmware, non-zero in other case */ -int intel_guc_select_fw (struct intel_guc *guc) +void intel_guc_select_fw (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);
@@ -409,9 +408,9 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.major_ver_wanted =GLK_FW_MAJOR ; guc->fw.minor_ver_wanted =GLK_FW_MINOR ; }else { -DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); -return -ENOENT ; +if (HAS_GUC (dev_priv)) +DRM_ERROR ("No GUC FW known for a platform with GuC!\n" ); +return ; } -return 0 ; }
drivers/gpu/drm/i915/intel_huc.c +3 -1
@@ -175,7 +175,9 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.major_ver_wanted =GLK_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted =GLK_HUC_FW_MINOR ; }else { -DRM_ERROR ("No HuC firmware known for platform with HuC!\n" ); +/* For now, everything with a GuC also has a HuC */ +if (HAS_GUC (dev_priv)) +DRM_ERROR ("No HuC FW known for a platform with HuC!\n" );return ; } }
drivers/gpu/drm/i915/intel_uc.c +38 -34
116 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +1 -2
@@ -1802,8 +1802,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv) {int ret; -if (!HAS_GUC (dev_priv)) -return -EINVAL ; +GEM_BUG_ON (!HAS_GUC (dev_priv));intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); ret =gen6_hw_domain_reset (dev_priv,GEN9_GRDOM_GUC );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 2/3] drm/i915/guc : Removing i915_modparams.enable_guc_loading module parameter
Quoted 119 lines · Sujaritha Sundaresan
We currently have two module parameters that control GuC: "
enable_guc_loading" and "enable_guc_submission". Whenever we need i915_modparams.enable_guc_submission=1, we also need enable_guc_loading=1. We also need enable_guc_loading=1 when we want to verify the HuC,
which is every time we have a HuC (but all platforms with HuC have a GuC and viceversa).v2: Clarifying the commit message (Anusha)
v3: Unify
seq_putsmessages, Re-factoring code as per review (Michal)v4: Rebase
v5: Separating message unification into a separate patch
v6: Re-factoring code (Sagar, Michal)
RebaseSuggested by: Oscar Mateo <[email protected]>
Signed-off-by Sujaritha Sundaresan <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Oscar Mateo <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 6 +-- drivers/gpu/drm/i915/i915_drv.h | 9 +++-- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 4 -- drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_guc.h | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 9 ++--- drivers/gpu/drm/i915/intel_huc.c | 4 +- drivers/gpu/drm/i915/intel_uc.c | 72 +++++++++++++++++---------------- drivers/gpu/drm/i915/intel_uncore.c | 3 +- 12 files changed, 59 insertions(+), 57 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +3
-3@@ -2390,7 +2390,7 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; -if (!HAS_HUC_UCODE (dev_priv)) +if (!HAS_GUC (dev_priv))seq_puts (m,"not supported\n" );return 0 ;@@ -2424,7 +2424,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;u32 tmp, i; -if (!HAS_GUC_UCODE (dev_priv)) +if (!HAS_GUC (dev_priv))seq_puts (m,"not supported\n" );return 0 ;@@ -2521,7 +2521,7 @@ static bool check_guc_submission(struct seq_file *m)if (!guc->execbuf_client) {seq_printf (m,"GuC submission %s\n" , -HAS_GUC_SCHED (dev_priv) ? +HAS_GUC (dev_priv) ?"disabled" :"not supported" );return false;drivers/gpu/drm/i915/i915_drv.h +6
-3@@ -3182,9 +3182,12 @@ static inline unsigned int i915_sg_segment_size(void)*/ #define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_CT (dev_priv) ((dev_priv)->info.has_guc_ct) -#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) -#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) -#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) +#define HAS_GUC_UCODE (dev_priv) ((dev_priv)->guc.fw.path != NULL) +#define HAS_HUC_UCODE (dev_priv) ((dev_priv)->huc.fw.path != NULL) + +#define NEEDS_GUC_LOADING (dev_priv) \ + (HAS_GUC(dev_priv) && \ + (i915_modparams.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)drivers/gpu/drm/i915/i915_gem_context.c +1
-1@@ -314,7 +314,7 @@ static u32 default_desc_template(const struct drm_i915_private *i915,* present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ -if (HAS_GUC (dev_priv) && i915_modparams.enable_guc_loading) +if (NEEDS_GUC_LOADING (dev_priv)) ctx->ggtt_offset_bias =GUC_WOPCM_TOP ;else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -3483,7 +3483,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)* currently don't have any bits spare to pass in this upper * restriction! */ -if (HAS_GUC (dev_priv) && i915_modparams.enable_guc_loading) { +if (NEEDS_GUC_LOADING (dev_priv)) { ggtt->base.total =min_t (u64, ggtt->base.total,GUC_GGTT_TOP ); ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); }drivers/gpu/drm/i915/i915_irq.c +0
-0
drivers/gpu/drm/i915/i915_irq.c void intel_irq_init(struct drm_i915_private *dev_priv) · line 4026
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -4022,7 +4022,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)for (i =0 ; i <MAX_L3_SLICES ; ++i) dev_priv->l3_parity.remap_info[i] =NULL ; -if (HAS_GUC_SCHED (dev_priv)) +if (NEEDS_GUC_LOADING (dev_priv)) dev_priv->pm_guc_events =GEN9_GUC_TO_HOST_INT_EVENT ;
At this point enable_guc_submission parameter is not sanitized. it is sanitized during driver_init_hw that happens post driver_init_early(intel_irq_init). So I think this should be only HAS_GUC.
Quoted 47 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0/* Let's track the enabled rps events */ drivers/gpu/drm/i915/i915_params.c +0
-4@@ -162,10 +162,6 @@ struct i915_params i915_modparams __read_mostly = {"(0=use value from vbt [default], 1=low power swing(200mV)," "2=default swing(400mV))"); -i915_param_named_unsafe (enable_guc_loading, int,0400 , -"Enable GuC firmware loading " -"(-1=auto, 0=never [default], 1=if available, 2=required)" ); -i915_param_named_unsafe (enable_guc_submission, int,0400 ,"Enable GuC submission " "(-1=auto, 0=never [default], 1=if available, 2=required)" );drivers/gpu/drm/i915/i915_params.h +0
-1@@ -44,7 +44,6 @@ 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, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \drivers/gpu/drm/i915/intel_guc.h +1
-1@@ -103,7 +103,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)int intel_guc_resume (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); -int intel_guc_select_fw (struct intel_guc *guc); +void intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_guc_loader.c +0
-0
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_init_hw(struct intel_guc *guc) · line 383
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-1@@ -380,9 +380,8 @@ int intel_guc_init_hw(struct intel_guc *guc)* intel_guc_select_fw() - selects GuC firmware for loading * @guc: intel_guc struct * -* Return: zero when we know firmware, non-zero in other case
This change can be a new patch and since this/most of the patch is depending on Michal's series I would suggest to post the series once that gets merged.
Quoted 42 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-4*/ -int intel_guc_select_fw (struct intel_guc *guc) +void intel_guc_select_fw (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);@@ -409,9 +408,9 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.major_ver_wanted =GLK_FW_MAJOR ; guc->fw.minor_ver_wanted =GLK_FW_MINOR ; }else { -DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); -return -ENOENT ; +if (HAS_GUC (dev_priv)) +DRM_ERROR ("No GUC FW known for a platform with GuC!\n" ); +return ; } -return 0 ; }drivers/gpu/drm/i915/intel_huc.c +3
-1@@ -175,7 +175,9 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.major_ver_wanted =GLK_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted =GLK_HUC_FW_MINOR ; }else { -DRM_ERROR ("No HuC firmware known for platform with HuC!\n" ); +/* For now, everything with a GuC also has a HuC */ +if (HAS_GUC (dev_priv)) +DRM_ERROR ("No HuC FW known for a platform with HuC!\n" );return ; } }drivers/gpu/drm/i915/intel_uc.c +0
-0@@ -49,45 +49,53 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)void intel_uc_sanitize_options (struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 55
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +3
-6+/* Verify hardware support */ if (!HAS_GUC (dev_priv)) { -if (i915_modparams.enable_guc_loading >0 || - i915_modparams.enable_guc_submission >0 ) -DRM_INFO ("Ignoring GuC options, no hardware\n" ); - - i915_modparams.enable_guc_loading =0 ; - i915_modparams.enable_guc_submission =0 ; +if (i915_modparams.enable_guc_submission >0 ) +DRM_INFO ("Ignoring GuC submission enable, no HW\n" );
Can we say option in the message - "Ignoring GuC submission enable option, no hardware" split the message over two lines.
drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 65
Quoted 13 lines
drivers/gpu/drm/i915/intel_uc.c +7
-3+ i915_modparams.enable_guc_submission =0 ;return ; } -/* A negative value means "use platform default" */ -if (i915_modparams.enable_guc_loading <0 ) - i915_modparams.enable_guc_loading =HAS_GUC_UCODE (dev_priv); +/* Verify firmware support */ +if (!HAS_GUC_UCODE (dev_priv)) { +if (i915_modparams.enable_guc_submission ==1 ) { +DRM_INFO ("Ignoring GuC submission enable, no FW\n" ); + i915_modparams.enable_guc_submission =0 ; +return ;
this return is not aligned properly. code indentation needs to updated.
please run "scripts/checkpatch.pl --strict" on all patches that helps identify such issues faster.
Quoted 98 lines
drivers/gpu/drm/i915/intel_uc.c +28
-25+ } -/* Verify firmware version */ -if (i915_modparams.enable_guc_loading) { -if (HAS_HUC_UCODE (dev_priv)) -intel_huc_select_fw (&dev_priv->huc); +if (i915_modparams.enable_guc_submission <0 ) { + i915_modparams.enable_guc_submission =0 ; +return ; + } -if (intel_guc_select_fw (&dev_priv->guc)) - i915_modparams.enable_guc_loading =0 ; +/* +* If "required" (> 1), let it continue and we will fail later +* due to the lack of firmware +*/ } -/* Can't enable guc submission without guc loaded */ -if (!i915_modparams.enable_guc_loading) - i915_modparams.enable_guc_submission =0 ; - -/* A negative value means "use platform default" */ +/* +* A negative value means "use platform default" (enabled if we have +* survived to get here) +*/ if (i915_modparams.enable_guc_submission <0 ) - i915_modparams.enable_guc_submission =HAS_GUC_SCHED (dev_priv); + i915_modparams.enable_guc_submission =HAS_GUC (dev_priv); + }void intel_uc_init_early (struct drm_i915_private *dev_priv) {intel_guc_init_early (&dev_priv->guc); +intel_guc_select_fw (&dev_priv->guc); +intel_huc_select_fw (&dev_priv->huc); }void intel_uc_init_fw (struct drm_i915_private *dev_priv) { +if (!HAS_GUC (dev_priv)) +return ;intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw);intel_uc_fw_fetch (dev_priv, &dev_priv->guc.fw); }@@ -154,7 +162,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)struct intel_guc *guc = &dev_priv->guc;int ret, attempts; -if (!i915_modparams.enable_guc_loading) +if (!NEEDS_GUC_LOADING (dev_priv))return 0 ;guc_disable_communication (guc);@@ -244,19 +252,15 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)i915_ggtt_disable_guc (dev_priv);DRM_ERROR ("GuC init failed\n" ); -if (i915_modparams.enable_guc_loading >1 || - i915_modparams.enable_guc_submission >1 ) +if (i915_modparams.enable_guc_submission >1 ) { +DRM_NOTE ("GuC is required, so marking the GPU as wedged\n" ); ret = -EIO ; -else - ret =0 ; - -if (i915_modparams.enable_guc_submission) { - i915_modparams.enable_guc_submission =0 ; + }else if (i915_modparams.enable_guc_submission ==1 ) {DRM_NOTE ("Falling back from GuC submission to execlist mode\n" ); - } - - i915_modparams.enable_guc_loading =0 ; -DRM_NOTE ("GuC firmware loading disabled\n" ); + i915_modparams.enable_guc_submission =0 ; + ret =0 ; + }else + ret =0 ;return ret; }@@ -265,7 +269,7 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv) {guc_free_load_err_log (&dev_priv->guc); -if (!i915_modparams.enable_guc_loading) +if (!NEEDS_GUC_LOADING (dev_priv))return ;if (i915_modparams.enable_guc_submission)drivers/gpu/drm/i915/intel_uncore.c +0
-0
drivers/gpu/drm/i915/intel_uncore.c int intel_guc_reset(struct drm_i915_private *dev_priv) · line 1808
Quoted 9 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-2@@ -1802,8 +1802,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv) {int ret; -if (!HAS_GUC (dev_priv)) -return -EINVAL ; +GEM_BUG_ON (!HAS_GUC (dev_priv));intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); ret =gen6_hw_domain_reset (dev_priv,GEN9_GRDOM_GUC );
Overall patch logic looks fine. Will need some more updates/rebase later as suggested.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6 2/3] drm/i915/guc : Removing i915_modparams.enable_guc_loading module parameter
Quoted 120 lines · Sagar Arun Kamble
Quoted 117 lines · Sujaritha Sundaresan
We currently have two module parameters that control GuC: "
enable_guc_loading" and "enable_guc_submission". Whenever we need i915_modparams.enable_guc_submission=1, we also need enable_guc_loading=1. We also need enable_guc_loading=1 when we want to verify the HuC,
which is every time we have a HuC (but all platforms with HuC have a GuC and viceversa).v2: Clarifying the commit message (Anusha)
v3: Unify
seq_putsmessages, Re-factoring code as per review (Michal)v4: Rebase
v5: Separating message unification into a separate patch
v6: Re-factoring code (Sagar, Michal)
RebaseSuggested by: Oscar Mateo <[email protected]>
Signed-off-by Sujaritha Sundaresan <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc Oscar Mateo <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 6 +-- drivers/gpu/drm/i915/i915_drv.h | 9 +++--drivers/gpu/drm/i915/i915_gem_context.c| 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 4 -- drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_guc.h | 2 +-drivers/gpu/drm/i915/intel_guc_loader.c| 9 ++--- drivers/gpu/drm/i915/intel_huc.c | 4 +- drivers/gpu/drm/i915/intel_uc.c | 72
+++++++++++++++++----------------
drivers/gpu/drm/i915/intel_uncore.c | 3 +-12 files changed, 59 insertions(+), 57 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -2390,7 +2390,7 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data) struct drm_i915_private *dev_priv = node_to_i915(m->private); struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; - if (!HAS_HUC_UCODE(dev_priv)) + if (!HAS_GUC(dev_priv)) seq_puts(m, "not supported\n"); return 0;@@ -2424,7 +2424,7 @@ static int
i915_guc_load_status_info(struct seq_file *m, void *data)structintel_uc_fw*guc_fw=&dev_priv->guc.fw;
u32 tmp, i;
- if (!HAS_GUC_UCODE(dev_priv))
+ if (!HAS_GUC(dev_priv))
seq_puts(m, "not supported\n");
return 0;
@@ -2521,7 +2521,7 @@ static boolcheck_guc_submission(struct seq_file *m)if (!guc->execbuf_client) {
seq_printf(m, "GuC submission %s\n",
-HAS_GUC_SCHED(dev_priv)?
+HAS_GUC(dev_priv)?
"disabled" :
"not supported");
return false;drivers/gpu/drm/i915/i915_drv.h +6
-3@@ -3182,9 +3182,12 @@ static inline unsigned inti915_sg_segment_size(void) */ #define HAS_GUC(dev_priv) ((dev_priv)->info.has_guc) #define HAS_GUC_CT(dev_priv) ((dev_priv)->info.has_guc_ct) -#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) -#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) -#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) +#define HAS_GUC_UCODE (dev_priv) ((dev_priv)->guc.fw.path != NULL) +#define HAS_HUC_UCODE (dev_priv) ((dev_priv)->huc.fw.path != NULL) + +#define NEEDS_GUC_LOADING (dev_priv) \ + (HAS_GUC(dev_priv) && \ + (i915_modparams.enable_guc_submission || HAS_HUC_UCODE(dev_priv))) #define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)diff --git
a/drivers/gpu/drm/i915/i915_gem_context.cb/drivers/gpu/drm/i915/i915_gem_context.cindex 5bf96a2..692d609 100644drivers/gpu/drm/i915/i915_gem_context.c +1
-1@@ -314,7 +314,7 @@ static u32 default_desc_template(const structdrm_i915_private *i915, * present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ - if (HAS_GUC(dev_priv) && i915_modparams.enable_guc_loading) + if (NEEDS_GUC_LOADING(dev_priv)) ctx->ggtt_offset_bias = GUC_WOPCM_TOP;else
ctx->ggtt_offset_bias=I915_GTT_PAGE_SIZE;drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -3483,7 +3483,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private*dev_priv) * currently don't have any bits spare to pass in this upper * restriction! */ - if (HAS_GUC(dev_priv) && i915_modparams.enable_guc_loading) { + if (NEEDS_GUC_LOADING(dev_priv)) { ggtt->base.total = min_t(u64, ggtt->base.total, GUC_GGTT_TOP); ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);}
drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -4022,7 +4022,7 @@ void intel_irq_init(struct drm_i915_private
Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c void intel_irq_init(struct drm_i915_private *dev_priv) · line 4026
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +1
-0*dev_priv) for (i = 0; i < MAX_L3_SLICES; ++i) dev_priv->l3_parity.remap_info[i] = NULL; - if (HAS_GUC_SCHED(dev_priv)) + if (NEEDS_GUC_LOADING(dev_priv)) dev_priv->pm_guc_events = GEN9_GUC_TO_HOST_INT_EVENT;At this point
enable_guc_submissionparameter is not sanitized. it is sanitized duringdriver_init_hwthat happens postdriver_init_early(intel_irq_init). So I think this should be onlyHAS_GUC.
Thanks for pointing this out. I will make the change.
Quoted 42 lines
Quoted 42 lines
drivers/gpu/drm/i915/i915_irq.c +0
-0/* Let's track the enabled rps events */drivers/gpu/drm/i915/i915_params.c +0
-0@@ -162,10 +162,6 @@ struct i915_params i915_modparams __read_mostly = {"(0=use value from vbt [default], 1=low power swing(200mV)," "2=default swing(400mV))"); -i915_param_named_unsafe(enable_guc_loading, int, 0400, - "Enable GuC firmware loading "
- "(-1=auto, 0=never [default], 1=if available, 2=required)"); -
i915_param_named_unsafe(enable_guc_submission, int, 0400, "Enable GuC submission "
"(-1=auto, 0=never [default], 1=if available, 2=required)");drivers/gpu/drm/i915/i915_params.h +0
-1@@ -44,7 +44,6 @@ 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, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \drivers/gpu/drm/i915/intel_guc.h +1
-0@@ -103,7 +103,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) int intel_guc_resume(struct drm_i915_private *dev_priv); struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size); -int intel_guc_select_fw(struct intel_guc *guc); +void intel_guc_select_fw (struct intel_guc *guc); int intel_guc_init_hw(struct intel_guc *guc); u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);diff --git
a/drivers/gpu/drm/i915/intel_guc_loader.cb/drivers/gpu/drm/i915/intel_guc_loader.cindex c7a800a..cae8333 100644
---a/drivers/gpu/drm/i915/intel_guc_loader.c
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.h int intel_guc_init_hw(struct intel_guc *guc) · line 383
Quoted 6 lines
+++
b/drivers/gpu/drm/i915/intel_guc_loader.cdrivers/gpu/drm/i915/intel_guc.h +0
-1@@ -380,9 +380,8 @@ int intel_guc_init_hw(struct intel_guc *guc) * intel_guc_select_fw() - selects GuC firmware for loading * @guc: intel_guc struct * - * Return: zero when we know firmware, non-zero in other caseThis change can be a new patch and since this/most of the patch is depending on Michal's series I would suggest to post the series once that gets merged.
Will do.
Quoted 44 lines
Quoted 44 lines
drivers/gpu/drm/i915/intel_guc.h +1
-1*/ -int intel_guc_select_fw (struct intel_guc *guc) +void intel_guc_select_fw (struct intel_guc *guc) { struct drm_i915_private *dev_priv = guc_to_i915(guc); @@ -409,9 +408,9 @@ int intel_guc_select_fw(struct intel_guc *guc)
guc->fw.major_ver_wanted=GLK_FW_MAJOR;guc->fw.minor_ver_wanted=GLK_FW_MINOR;
} else {
-DRM_ERROR("No GuC firmware known for platform with GuC!\n"); - return-ENOENT;
+ if(HAS_GUC(dev_priv))
+DRM_ERROR("No GUC FW known for a platform with GuC!\n"); + return;
}
- return 0;
}drivers/gpu/drm/i915/intel_huc.c +3
-1@@ -175,7 +175,9 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR; huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR; } else { - DRM_ERROR("No HuC firmware known for platform with HuC!\n"); + /* For now, everything with a GuC also has a HuC */ + if (HAS_GUC(dev_priv)) + DRM_ERROR("No HuC FW known for a platform with HuC!\n"); return; } }drivers/gpu/drm/i915/intel_uc.c +1
-2@@ -49,45 +49,53 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) { + /* Verify hardware support */ if (!HAS_GUC(dev_priv)) { - if (i915_modparams.enable_guc_loading > 0 || - i915_modparams.enable_guc_submission > 0)
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 55
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.c +2
-4- DRM_INFO("Ignoring GuC options, no hardware\n"); - - i915_modparams.enable_guc_loading = 0; - i915_modparams.enable_guc_submission = 0; + if (i915_modparams.enable_guc_submission > 0) + DRM_INFO("Ignoring GuC submission enable, no HW\n");Can we say option in the message - "Ignoring GuC submission enable option, no hardware" split the message over two lines.
Will do.
Quoted 12 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +1
-0+ i915_modparams.enable_guc_submission =0 ; return; }- /* A negative value means "use platform default" */
Quoted 8 lines
- if (i915_modparams.enable_guc_loading < 0)
- i915_modparams.enable_guc_loading =HAS_GUC_UCODE(dev_priv); + /* Verify firmware support */
+ if (!HAS_GUC_UCODE(dev_priv)) {
+ if (i915_modparams.enable_guc_submission == 1) { +DRM_INFO("Ignoring GuC submission enable, no FW\n"); + i915_modparams.enable_guc_submission = 0; + return;
Quoted 2 lines
this return is not aligned properly. code indentation needs to updated.
please run "scripts/checkpatch.pl--strict" on all patches that helps identify such issues faster.
I will check the alignment.
Quoted 92 lines
Quoted 92 lines
+ }
- /* Verify firmware version */
- if (i915_modparams.enable_guc_loading) {
- if (HAS_HUC_UCODE(dev_priv))
-intel_huc_select_fw(&dev_priv->huc);
+ if (i915_modparams.enable_guc_submission < 0) {
+ i915_modparams.enable_guc_submission = 0;
+ return;
+ }
- if (intel_guc_select_fw(&dev_priv->guc))
- i915_modparams.enable_guc_loading = 0;
+ /*
+ * If "required" (> 1), let it continue and we will fail later + * due to the lack of firmware
+ */
}
- /* Can't enable guc submission without guc loaded */ - if (!i915_modparams.enable_guc_loading)
- i915_modparams.enable_guc_submission = 0;
-
- /* A negative value means "use platform default" */
+ /*
+ * A negative value means "use platform default" (enabled if we have
+ * survived to get here)
+ */
if (i915_modparams.enable_guc_submission < 0)
- i915_modparams.enable_guc_submission =HAS_GUC_SCHED(dev_priv); + i915_modparams.enable_guc_submission =HAS_GUC(dev_priv); +
}
voidintel_uc_init_early(struct drm_i915_private *dev_priv){
intel_guc_init_early(&dev_priv->guc);
+intel_guc_select_fw(&dev_priv->guc);
+intel_huc_select_fw(&dev_priv->huc);
}
voidintel_uc_init_fw(struct drm_i915_private *dev_priv){
+ if (!HAS_GUC(dev_priv))
+ return;
intel_uc_fw_fetch(dev_priv, &dev_priv->huc.fw);intel_uc_fw_fetch(dev_priv, &dev_priv->guc.fw);
}drivers/gpu/drm/i915/intel_uc.c +9
-11@@ -154,7 +162,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) struct intel_guc *guc = &dev_priv->guc; int ret, attempts; - if (!i915_modparams.enable_guc_loading) + if (!NEEDS_GUC_LOADING(dev_priv)) return 0; guc_disable_communication(guc);@@ -244,19 +252,15 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) i915_ggtt_disable_guc(dev_priv); DRM_ERROR("GuC init failed\n"); - if (i915_modparams.enable_guc_loading > 1 || - i915_modparams.enable_guc_submission > 1) + if (i915_modparams.enable_guc_submission > 1) { + DRM_NOTE("GuC is required, so marking the GPU as wedged\n"); ret = -EIO; - else - ret = 0; - - if (i915_modparams.enable_guc_submission) { - i915_modparams.enable_guc_submission = 0; + } else if (i915_modparams.enable_guc_submission == 1) { DRM_NOTE("Falling back from GuC submission to execlist mode\n"); - } - - i915_modparams.enable_guc_loading = 0; - DRM_NOTE("GuC firmware loading disabled\n"); + i915_modparams.enable_guc_submission = 0; + ret = 0; + } else + ret = 0; return ret; }@@ -265,7 +269,7 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv) { guc_free_load_err_log(&dev_priv->guc); - if (!i915_modparams.enable_guc_loading) + if (!NEEDS_GUC_LOADING(dev_priv)) return; if (i915_modparams.enable_guc_submission)drivers/gpu/drm/i915/intel_uncore.c +0
-0@@ -1802,8 +1802,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.c int intel_guc_reset(struct drm_i915_private *dev_priv) · line 1808
Quoted 7 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1{ int ret; - if (!HAS_GUC(dev_priv)) - return -EINVAL; + GEM_BUG_ON(!HAS_GUC(dev_priv)); intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);Overall patch logic looks fine. Will need some more updates/rebase later as suggested.
I will wait for Michal's series before sending the next revision.
Thanks for the review.
Regards,
Sujaritha
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 3/3 drm/i915/guc : Decouple logs and ADS from submission
In reply to Sujaritha SundaresanThe Additional Data Struct (ADS) contains objects that are required by guc post FW load and are not necessarily submission-only (although that's our current only use-case). If in the future we load GuC with submission disabled to use some other GuC feature we might still end up requiring something inside the ADS, so it makes more sense for them to be always created if GuC is loaded.
Similarly, we still want to access GuC logs even if GuC submission is disable to debug issues with GuC loading or with wathever we're using GuC for.
To make a concrete example, the pages used by GuC to save state during suspend are allocated as part of the ADS.
v3: Group initialization of GuC objects
v2: Decoupling ADS together with logs
v3: Re-factoring code as per review (Michal)
v4: Rebase
v5: Separating group object initialization into next patch
Clarifying commit message
v6: Reverting to goto err format (Michal)
Moved guc_ads functions to dedicated file
Rebase
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 105 +------------------------ drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_guc_ads.c | 120 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_ads.h | 31 ++++++++ drivers/gpu/drm/i915/intel_guc_log.c | 6 +- drivers/gpu/drm/i915/intel_uc.c | 40 +++++++++- 7 files changed, 196 insertions(+), 108 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.c create mode 100644 drivers/gpu/drm/i915/intel_guc_ads.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -62,6 +62,7 @@ i915-y += i915_cmd_parser.o \ i915-y += intel_uc.o \ intel_uc_fw.o \ intel_guc.o \ + intel_guc_ads.o \ intel_guc_ct.o \ intel_guc_log.o \ intel_guc_loader.o \
drivers/gpu/drm/i915/i915_guc_submission.c +1 -104
139 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -102,6 +102,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); +void i915_guc_policies_init (struct guc_policies *policies);void intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);
drivers/gpu/drm/i915/intel_guc_ads.c new file +120 -0
120 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc_ads.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Copyright © 2014-2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ + +#ifndef _INTEL_GUC_ADS_H_ +#define _INTEL_GUC_ADS_H_ + +int guc_ads_create (struct intel_guc *guc); +void guc_ads_destroy (struct intel_guc *guc); + +#endif
drivers/gpu/drm/i915/intel_guc_log.c +3 -3
@@ -505,7 +505,7 @@ static void guc_flush_logs(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -if (!i915_modparams.enable_guc_submission || +if (!NEEDS_GUC_LOADING (dev_priv) || (i915_modparams.guc_log_level <0 ))return ;
@@ -646,7 +646,7 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)void i915_guc_log_register (struct drm_i915_private *dev_priv) { -if (!i915_modparams.enable_guc_submission || +if (!NEEDS_GUC_LOADING (dev_priv) || (i915_modparams.guc_log_level <0 ))return ;
@@ -657,7 +657,7 @@ void i915_guc_log_register(struct drm_i915_private *dev_priv)void i915_guc_log_unregister (struct drm_i915_private *dev_priv) { -if (!i915_modparams.enable_guc_submission) +if (!NEEDS_GUC_LOADING (dev_priv))return ;mutex_lock (&dev_priv->drm.struct_mutex);
drivers/gpu/drm/i915/intel_uc.c +39 -1
@@ -24,6 +24,7 @@#include "intel_uc.h" #include "i915_drv.h" +#include "intel_guc_ads.h" #include "i915_guc_submission.h" /* Reset GuC providing us with fresh state for both GuC and HuC.
@@ -157,6 +158,36 @@ static void guc_disable_communication(struct intel_guc *guc) guc->send = intel_guc_send_nop; } +static int guc_shared_objects_init (struct intel_guc *guc) +{ +int ret; + +if (guc->ads_vma) +return 0 ; + + ret =intel_guc_log_create (guc); +if (ret <0 ) + goto err_vaddr; + + ret =guc_ads_create (guc); +if (ret <0 ) + goto err_log; + +return ret; + +err_log: +intel_guc_log_destroy (guc); +err_vaddr: +i915_gem_object_unpin_map (guc->stage_desc_pool->obj); +return ret; +} + +static void guc_shared_objects_fini (struct intel_guc *guc) +{ +guc_ads_destroy (guc); +intel_guc_log_destroy (guc); +} +int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;
@@ -171,6 +202,10 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)/* We need to notify the guc whenever we change the GGTT */ i915_ggtt_enable_guc (dev_priv); + ret =guc_shared_objects_init (guc); +if (ret) + goto err_guc; +if (i915_modparams.enable_guc_submission) {/* * This is stuff we need to have available at fw load time
@@ -178,7 +213,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)*/ ret =i915_guc_submission_init (dev_priv);if (ret) - goto err_guc; + goto err_shared; }/* init WOPCM */
@@ -248,6 +283,8 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) err_submission:if (i915_modparams.enable_guc_submission)i915_guc_submission_fini (dev_priv); +err_shared: +guc_shared_objects_fini (guc); err_guc:i915_ggtt_disable_guc (dev_priv);
@@ -282,5 +319,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)i915_guc_submission_fini (dev_priv); } +guc_shared_objects_fini (&dev_priv->guc);i915_ggtt_disable_guc (dev_priv); }
Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/guc : Removing enable_guc_loading module and Decoupling logs and ADS from submission
In reply to Sujaritha Sundaresan== Series Details ==
== Series Details ==
Series: drm/i915/guc : Removing enable_guc_loading module and Decoupling logs and ADS from submission
URL : https://patchwork.freedesktop.org/series/31677/
State : failure
== Summary ==
CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/i915_debugfs.o
drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_huc_load_status_info’:drivers/gpu/drm/i915/i915_debugfs.c:2393:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
if (!HAS_GUC(dev_priv))
^~drivers/gpu/drm/i915/i915_debugfs.c:2395:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
return 0;
^~~~~~drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_guc_load_status_info’:drivers/gpu/drm/i915/i915_debugfs.c:2427:2: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
if (!HAS_GUC(dev_priv))
^~drivers/gpu/drm/i915/i915_debugfs.c:2429:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
return 0;
^~~~~~
cc1: all warnings being treated as errorsscripts/Makefile.build:313: recipe for target 'drivers/gpu/drm/i915/i915_debugfs.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_debugfs.o] Error 1scripts/Makefile.build:572: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:572: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:572: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx