drm/i915/huc: Move firmware selection to init_early
Subsystems (2)
PATCH v4 1/8 drm/i915/huc: Move firmware selection to init_early
Doing HuC firmware path selection from sanitize_options function is not perfect, while there is no problem with doing so during early init stage as we already have all needed data.
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++ drivers/gpu/drm/i915/intel_huc.c | 60 +++++++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_huc.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 4 +-- 4 files changed, 42 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -3234,6 +3234,9 @@ intel_info(const struct drm_i915_private *dev_priv)#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)) + +/* For now, anything with a GuC has also HuC */ +#define HAS_HUC (dev_priv) (HAS_GUC(dev_priv))#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)
drivers/gpu/drm/i915/intel_huc.c +37 -23
80 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc.h +1 -1
@@ -34,7 +34,7 @@ struct intel_huc {/* HuC-specific additions */ }; -void intel_huc_select_fw (struct intel_huc *huc); +void intel_huc_init_early (struct intel_huc *huc);void intel_huc_init_hw (struct intel_huc *huc);void intel_huc_auth (struct intel_huc *huc);
drivers/gpu/drm/i915/intel_uc.c +1 -3
@@ -65,9 +65,6 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)/* Verify firmware version */ if (i915_modparams.enable_guc_loading) { -if (HAS_HUC_UCODE (dev_priv)) -intel_huc_select_fw (&dev_priv->huc); -if (intel_guc_fw_select (&dev_priv->guc)) i915_modparams.enable_guc_loading =0 ; }
@@ -84,6 +81,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)void intel_uc_init_early (struct drm_i915_private *dev_priv) {intel_guc_init_early (&dev_priv->guc); +intel_huc_init_early (&dev_priv->huc); }void intel_uc_init_fw (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/8 drm/i915/guc: Move firmware selection to init_early
Doing GuC firmware path selection from sanitize_options function is not perfect, while there is no problem with doing so during early init stage as we already have all needed data.
--- drivers/gpu/drm/i915/intel_guc.c | 1 + drivers/gpu/drm/i915/intel_guc_fw.c | 63 +++++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_guc_fw.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 2 +- drivers/gpu/drm/i915/intel_uc_fw.h | 5 +++ 5 files changed, 44 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +1 -0
@@ -61,6 +61,7 @@ void intel_guc_init_send_regs(struct intel_guc *guc)void intel_guc_init_early (struct intel_guc *guc) { +intel_guc_fw_init_early (guc);intel_guc_ct_init_early (&guc->ct);mutex_init (&guc->send_mutex);
drivers/gpu/drm/i915/intel_guc_fw.c +36 -27
81 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc_fw.h +1 -1
@@ -27,7 +27,7 @@struct intel_guc ; -int intel_guc_fw_select (struct intel_guc *guc); +void intel_guc_fw_init_early (struct intel_guc *guc);int intel_guc_fw_upload (struct intel_guc *guc);#endif
drivers/gpu/drm/i915/intel_uc.c +1 -1
@@ -65,7 +65,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)/* Verify firmware version */ if (i915_modparams.enable_guc_loading) { -if (intel_guc_fw_select (&dev_priv->guc)) +if (!intel_uc_fw_is_selected (&dev_priv->guc.fw)) i915_modparams.enable_guc_loading =0 ; }
drivers/gpu/drm/i915/intel_uc_fw.h +5 -0
@@ -110,6 +110,11 @@ void intel_uc_fw_init(struct intel_uc_fw *uc_fw, enum intel_uc_fw_type type) uc_fw->type = type; } +static inline bool intel_uc_fw_is_selected (struct intel_uc_fw *uc_fw) +{ +return uc_fw->path !=NULL ; +} +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw); int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/8 drm/i915/guc: Introduce USES_GUC_xxx helper macros
In reply to Michal WajdeczkoIn the upcoming patch we will change the way how to recognize when GuC is in use. Using helper macros will minimize scope of that changes. While here, update dev_info message.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_guc.c | 2 +- drivers/gpu/drm/i915/intel_guc_log.c | 6 +++--- drivers/gpu/drm/i915/intel_gvt.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 23 +++++++++++------------ drivers/gpu/drm/i915/selftests/intel_guc.c | 2 +- 9 files changed, 25 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -3239,6 +3239,10 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_HUC (dev_priv) (HAS_GUC(dev_priv))#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) +/* Having a GuC is not the same as using a GuC */ +#define USES_GUC (dev_priv) (i915_modparams.enable_guc_loading) +#define USES_GUC_SUBMISSION (dev_priv) (i915_modparams.enable_guc_submission) +#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)#define HAS_POOLED_EU (dev_priv) ((dev_priv)->info.has_pooled_eu)
drivers/gpu/drm/i915/i915_gem_context.c +2 -2
@@ -316,7 +316,7 @@ __create_hw_context(struct drm_i915_private *dev_priv,* 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 (USES_GUC (dev_priv)) ctx->ggtt_offset_bias =GUC_WOPCM_TOP ;else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;
@@ -409,7 +409,7 @@ i915_gem_context_create_gvt(struct drm_device *dev)i915_gem_context_set_closed (ctx);/* not user accessible */ i915_gem_context_clear_bannable (ctx);i915_gem_context_set_force_single_submission (ctx); -if (!i915_modparams.enable_guc_submission) +if (!USES_GUC_SUBMISSION (to_i915 (dev))) ctx->ring_size =512 *PAGE_SIZE ;/* Max ring buffer size */ GEM_BUG_ON (i915_gem_context_is_kernel (ctx));
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -3503,7 +3503,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 (USES_GUC (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
@@ -1400,7 +1400,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)if (iir & (GT_RENDER_USER_INTERRUPT << test_shift)) {notify_ring (engine); - tasklet |= i915_modparams.enable_guc_submission; + tasklet |=USES_GUC_SUBMISSION (engine->i915); }if (tasklet)
drivers/gpu/drm/i915/intel_guc.c +1 -1
@@ -129,7 +129,7 @@ void intel_guc_init_params(struct intel_guc *guc) }/* If GuC submission is enabled, set up additional parameters here */ -if (i915_modparams.enable_guc_submission) { +if (USES_GUC_SUBMISSION (dev_priv)) {u32 ads =guc_ggtt_offset (guc->ads_vma) >>PAGE_SHIFT ;u32 pgs =guc_ggtt_offset (dev_priv->guc.stage_desc_pool);u32 ctx_in_16 =GUC_MAX_STAGE_DESCRIPTORS /16 ;
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 (!USES_GUC_SUBMISSION (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 (!USES_GUC_SUBMISSION (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 (!USES_GUC_SUBMISSION (dev_priv))return ;mutex_lock (&dev_priv->drm.struct_mutex);
drivers/gpu/drm/i915/intel_gvt.c +1 -1
@@ -95,7 +95,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)return 0 ; } -if (i915_modparams.enable_guc_submission) { +if (USES_GUC_SUBMISSION (dev_priv)) {DRM_ERROR ("i915 GVT-g loading failed due to Graphics virtualization is not yet supported with GuC submission\n" );return -EIO ; }
drivers/gpu/drm/i915/intel_uc.c +11 -12
@@ -152,7 +152,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 (!USES_GUC (dev_priv))return 0 ;guc_disable_communication (guc);
@@ -161,7 +161,7 @@ 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); -if (i915_modparams.enable_guc_submission) { +if (USES_GUC_SUBMISSION (dev_priv)) {/* * This is stuff we need to have available at fw load time * if we are planning to enable submission later
@@ -211,7 +211,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_log_capture;intel_huc_auth (&dev_priv->huc); -if (i915_modparams.enable_guc_submission) { +if (USES_GUC_SUBMISSION (dev_priv)) {if (i915_modparams.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
@@ -220,11 +220,10 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_interrupts; } -dev_info (dev_priv->drm.dev,"GuC %s (firmware %s [version %u.%u])\n" , - i915_modparams.enable_guc_submission ?"submission enabled" : -"loaded" , - guc->fw.path, +dev_info (dev_priv->drm.dev,"GuC firmware version %u.%u\n" , guc->fw.major_ver_found, guc->fw.minor_ver_found); +dev_info (dev_priv->drm.dev,"GuC submission %s\n" , +enableddisabled (USES_GUC_SUBMISSION (dev_priv)));return 0 ;
@@ -243,7 +242,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) err_log_capture:guc_capture_load_err_log (guc); err_submission: -if (i915_modparams.enable_guc_submission) +if (USES_GUC_SUBMISSION (dev_priv))intel_guc_submission_fini (guc); err_guc:i915_ggtt_disable_guc (dev_priv);
@@ -257,7 +256,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) ret =0 ; } -if (i915_modparams.enable_guc_submission) { +if (USES_GUC_SUBMISSION (dev_priv)) { i915_modparams.enable_guc_submission =0 ;DRM_NOTE ("Falling back from GuC submission to execlist mode\n" ); }
@@ -273,15 +272,15 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)guc_free_load_err_log (guc); -if (!i915_modparams.enable_guc_loading) +if (!USES_GUC (dev_priv))return ; -if (i915_modparams.enable_guc_submission) +if (USES_GUC_SUBMISSION (dev_priv))intel_guc_submission_disable (guc);guc_disable_communication (guc); -if (i915_modparams.enable_guc_submission) { +if (USES_GUC_SUBMISSION (dev_priv)) {gen9_disable_guc_interrupts (dev_priv);intel_guc_submission_fini (guc); }
drivers/gpu/drm/i915/selftests/intel_guc.c +1 -1
@@ -362,7 +362,7 @@ int intel_guc_live_selftest(struct drm_i915_private *dev_priv) SUBTEST(igt_guc_doorbells), }; -if (!i915_modparams.enable_guc_submission) +if (!USES_GUC_SUBMISSION (dev_priv))return 0 ;return i915_subtests (tests, dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/8 drm/i915/uc: Don't fetch GuC firmware if no plan to use GuC
In reply to Michal WajdeczkoIf we don't plan to use GuC then we should not try to fetch GuC and HuC firmwares. We can save memory and avoid possible dmesg noise.
--- drivers/gpu/drm/i915/intel_uc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_uc.c +6 -0
@@ -86,12 +86,18 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)void intel_uc_init_fw (struct drm_i915_private *dev_priv) { +if (!USES_GUC (dev_priv)) +return ; +intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw);intel_uc_fw_fetch (dev_priv, &dev_priv->guc.fw); }void intel_uc_fini_fw (struct drm_i915_private *dev_priv) { +if (!USES_GUC (dev_priv)) +return ; +intel_uc_fw_fini (&dev_priv->guc.fw);intel_uc_fw_fini (&dev_priv->huc.fw); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 5/8 drm/i915/uc: Don't use -EIO to report missing firmware
In reply to Michal Wajdeczko-EIO has special meaning and is used when we want to allow engine initialization to fail and mark GPU as wedged.
However here at this function we should return error code that corresponds to upload status only, as any decision how to handle missing firmware should be done higher level function (silent fallback to non-GuC mode, fail into wedged mode, or abort driver load with fatal error).
v2: commit message update (Michal)
--- drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_uc_fw.c +1 -1
@@ -214,7 +214,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, intel_uc_fw_type_repr(uc_fw->type), uc_fw->path);if (uc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) -return -EIO ; +return -ENOEXEC ; uc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; DRM_DEBUG_DRIVER("%s fw load %s\n",
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/8 drm/i915/guc: Combine enable_guc_loading|submission modparams
In reply to Michal WajdeczkoWe currently have two module parameters that control GuC:
"enable_guc_loading" and "enable_guc_submission". Whenever we need submission=1, we also need loading=1. We also need loading=1 when we want to want to load and verify the HuC.
Lets combine above module parameters into one "enable_guc" modparam. New supported bit values are:
0=disable GuC (no GuC submission, no HuC)
1=enable GuC submission
2=enable HuC load
Special value "-1" can be used to let driver decide what option should be enabled for given platform based on hardware/firmware availability or preference.
Explicit enabling any of the GuC features makes GuC load a required step, fallback to non-GuC mode will not be supported.
v2: Don't use -EIO
v3: define modparam bits (Chris)
v4: rely on implicit cast (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_params.c | 11 ++-- drivers/gpu/drm/i915/i915_params.h | 7 ++- drivers/gpu/drm/i915/intel_uc.c | 109 ++++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_uc.h | 19 +++++++ 5 files changed, 96 insertions(+), 55 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -2
@@ -3240,8 +3240,9 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))/* Having a GuC is not the same as using a GuC */ -#define USES_GUC (dev_priv) (i915_modparams.enable_guc_loading) -#define USES_GUC_SUBMISSION (dev_priv) (i915_modparams.enable_guc_submission) +#define USES_GUC (dev_priv) intel_uc_is_using_guc() +#define USES_GUC_SUBMISSION (dev_priv) intel_uc_is_using_guc_submission() +#define USES_HUC (dev_priv) intel_uc_is_using_huc()#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)
drivers/gpu/drm/i915/i915_params.c +4 -7
@@ -147,13 +147,10 @@ i915_param_named_unsafe(edp_vswing, int, 0400,"(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)" ); +i915_param_named_unsafe (enable_guc, int,0400 , +"Enable GuC load for GuC submission and/or HuC load. " +"Required functionality can be selected using bitmask values. " +"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load)" );i915_param_named (guc_log_level, int,0400 ,"GuC firmware logging level (-1:disabled (default), 0-3:enabled)" );
drivers/gpu/drm/i915/i915_params.h +5 -2
@@ -25,8 +25,12 @@#ifndef _I915_PARAMS_H_#define _I915_PARAMS_H_ +#include <linux/bitops.h> #include <linux/cache.h> /* for __read_mostly */ +#define ENABLE_GUC_SUBMISSION BIT(0) +#define ENABLE_GUC_LOAD_HUC BIT(1) +#define I915_PARAMS_FOR_EACH (param) \ param(char *, vbt_firmware, NULL) \ param(int, modeset, -1) \
@@ -41,8 +45,7 @@ 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, 0) \ param(int, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
drivers/gpu/drm/i915/intel_uc.c +65 -44
141 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +19 -0
@@ -26,6 +26,7 @@#include "intel_guc.h" #include "intel_huc.h" +#include "i915_params.h" void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_early (struct drm_i915_private *dev_priv);
@@ -35,4 +36,22 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv);int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_fini_hw (struct drm_i915_private *dev_priv); +static inline bool intel_uc_is_using_guc (void ) +{ +GEM_BUG_ON (i915_modparams.enable_guc <0 ); +return i915_modparams.enable_guc >0 ; +} + +static inline bool intel_uc_is_using_guc_submission (void ) +{ +GEM_BUG_ON (i915_modparams.enable_guc <0 ); +return i915_modparams.enable_guc &ENABLE_GUC_SUBMISSION ; +} + +static inline bool intel_uc_is_using_huc (void ) +{ +GEM_BUG_ON (i915_modparams.enable_guc <0 ); +return i915_modparams.enable_guc &ENABLE_GUC_LOAD_HUC ; +} +#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 7/8 drm/i915/huc: Load HuC only if requested
In reply to Michal WajdeczkoOur new "enable_guc" modparam allows to control whenever HuC should be loaded. However existing code will try load and authenticate HuC always when we use the GuC. This patch is trying to enforce modparam selection.
v2: no need to cast PTR_ERR (Chris)
fetch/fini only if required (Michal)
fix wrong break (Sagar)
v3: add new goto label (Sagar)
--- drivers/gpu/drm/i915/intel_huc.c | 21 +++++++++++---------- drivers/gpu/drm/i915/intel_huc.h | 4 ++-- drivers/gpu/drm/i915/intel_uc.c | 28 +++++++++++++++++++++++----- 3 files changed, 36 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_huc.c +11 -10
@@ -181,17 +181,17 @@ static int huc_ucode_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma)* intel_huc_init_hw() - load HuC uCode to device * @huc: intel_huc structure * -* Called from guc_setup() during driver loading and also after a GPU reset. -* Be note that HuC loading must be done before GuC loading. +* Called from intel_uc_init_hw() during driver loading and also after a GPU +* reset. Be note that HuC loading must be done before GuC loading. * * The firmware image should have already been fetched into memory by the -* earlier call to intel_huc_init(), so here we need only check that +* earlier call to intel_uc_init_fw(), so here we need only check that * is succeeded, and then transfer the image to the h/w. * */ -void intel_huc_init_hw (struct intel_huc *huc) +int intel_huc_init_hw (struct intel_huc *huc) { -intel_uc_fw_upload (&huc->fw, huc_ucode_xfer); +return intel_uc_fw_upload (&huc->fw, huc_ucode_xfer); }/**
@@ -205,7 +205,7 @@ void intel_huc_init_hw(struct intel_huc *huc)* signature through intel_guc_auth_huc(). It then waits for 50ms for * firmware verification ACK and unpins the object. */ -void intel_huc_auth (struct intel_huc *huc) +int intel_huc_auth (struct intel_huc *huc) {struct drm_i915_private *i915 =huc_to_i915 (huc);struct intel_guc *guc = &i915->guc;
@@ -213,14 +213,14 @@ void intel_huc_auth(struct intel_huc *huc)int ret;if (huc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) -return ; +return -ENOEXEC ; vma =i915_gem_object_ggtt_pin (huc->fw.obj,NULL ,0 ,0 ,PIN_OFFSET_BIAS |GUC_WOPCM_TOP );if (IS_ERR (vma)) { -DRM_ERROR ("failed to pin huc fw object %d\n" , - (int )PTR_ERR (vma)); -return ; + ret =PTR_ERR (vma); +DRM_ERROR ("HuC: Failed to pin huc fw object %d\n" , ret); +return ret; } ret = intel_guc_auth_huc(guc,
@@ -243,4 +243,5 @@ void intel_huc_auth(struct intel_huc *huc) out:i915_vma_unpin (vma); +return ret; }
drivers/gpu/drm/i915/intel_huc.h +2 -2
@@ -35,7 +35,7 @@ struct intel_huc { };void intel_huc_init_early (struct intel_huc *huc); -void intel_huc_init_hw (struct intel_huc *huc); -void intel_huc_auth (struct intel_huc *huc); +int intel_huc_init_hw (struct intel_huc *huc); +int intel_huc_auth (struct intel_huc *huc);#endif
drivers/gpu/drm/i915/intel_uc.c +23 -5
@@ -119,7 +119,9 @@ void intel_uc_init_fw(struct drm_i915_private *dev_priv)if (!USES_GUC (dev_priv))return ; -intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw); +if (USES_HUC (dev_priv)) +intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw); +intel_uc_fw_fetch (dev_priv, &dev_priv->guc.fw); }
@@ -129,7 +131,9 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv)return ;intel_uc_fw_fini (&dev_priv->guc.fw); -intel_uc_fw_fini (&dev_priv->huc.fw); + +if (USES_HUC (dev_priv)) +intel_uc_fw_fini (&dev_priv->huc.fw); }/**
@@ -186,6 +190,7 @@ static void guc_disable_communication(struct intel_guc *guc)int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc; +struct intel_huc *huc = &dev_priv->huc;int ret, attempts;if (!USES_GUC (dev_priv))
@@ -233,7 +238,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)if (ret) goto err_submission; -intel_huc_init_hw (&dev_priv->huc); +if (USES_HUC (dev_priv)) { + ret =intel_huc_init_hw (huc); +if (ret) + goto err_submission; + } +intel_guc_init_params (guc); ret =intel_guc_fw_upload (guc);if (ret ==0 || ret != -EAGAIN )
@@ -251,7 +261,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)if (ret) goto err_log_capture; -intel_huc_auth (&dev_priv->huc); +if (USES_HUC (dev_priv)) { + ret =intel_huc_auth (huc); +if (ret) + goto err_communication; + } +if (USES_GUC_SUBMISSION (dev_priv)) {if (i915_modparams.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
@@ -265,6 +280,8 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) guc->fw.major_ver_found, guc->fw.minor_ver_found);dev_info (dev_priv->drm.dev,"GuC submission %s\n" ,enableddisabled (USES_GUC_SUBMISSION (dev_priv))); +dev_info (dev_priv->drm.dev,"HuC %s\n" , +enableddisabled (USES_HUC (dev_priv)));return 0 ;
@@ -272,8 +289,9 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)* We've failed to load the firmware :( */ err_interrupts: -guc_disable_communication (guc);gen9_disable_guc_interrupts (dev_priv); +err_communication: +guc_disable_communication (guc); err_log_capture:guc_capture_load_err_log (guc); err_submission:
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 8/8 HAX enable GuC/HuC load
In reply to Michal WajdeczkoAlso revert ("drm/i915/guc: Assert that we switch between known ggtt->invalidate functions")
v2: don't enable GuC on GLK
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++------ drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -6
@@ -3590,17 +3590,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 +1 -1
@@ -45,7 +45,7 @@ param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \ param(int, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
drivers/gpu/drm/i915/intel_uc.c +2 -0
@@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) enable_guc |=ENABLE_GUC_LOAD_HUC ;/* Any platform specific fine-tuning can be done here */ +if (IS_GEMINILAKE (dev_priv)) + enable_guc =0 ;/* no firmware on CI machines */ return enable_guc; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [CI,v4,1/8] drm/i915/huc: Move firmware selection to init_early
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: series starting with [CI,v4,1/8] drm/i915/huc: Move firmware selection to init_early
URL : https://patchwork.freedesktop.org/series/34970/
State : warning
== Summary ==
Series 34970v1 series starting with [CI,v4,1/8] drm/i915/huc: Move firmware selection to init_early
https://patchwork.freedesktop.org/api/1.0/series/34970/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-warn -> DMESG-FAIL (fi-elk-e7500) fdo#103989 +1
pass -> DMESG-WARN (fi-skl-6260u)
pass -> DMESG-WARN (fi-skl-6600u)
pass -> DMESG-WARN (fi-skl-6700hq)
pass -> DMESG-WARN (fi-skl-6700k)
pass -> DMESG-WARN (fi-skl-6770hq)
pass -> DMESG-WARN (fi-bxt-dsi)
pass -> DMESG-WARN (fi-bxt-j4205)
pass -> DMESG-WARN (fi-kbl-7560u)
pass -> DMESG-WARN (fi-kbl-7567u)
pass -> DMESG-WARN (fi-kbl-r)
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
notrun -> INCOMPLETE (fi-elk-e7500)
Subgroup hang-read-crc-pipe-b:
pass -> FAIL (fi-skl-6700k) fdo#103191fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:381s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:519s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:281s fi-bxt-dsi total:288 pass:257 dwarn:1 dfail:0 fail:0 skip:30 time:479s fi-bxt-j4205 total:288 pass:258 dwarn:1 dfail:0 fail:0 skip:29 time:486s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:487s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:473s fi-elk-e7500 total:229 pass:167 dwarn:14 dfail:1 fail:0 skip:46 fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:271s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:537s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:360s fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:262s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:480s fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:450s fi-kbl-7560u total:288 pass:268 dwarn:1 dfail:0 fail:0 skip:19 time:513s fi-kbl-7567u total:288 pass:267 dwarn:1 dfail:0 fail:0 skip:20 time:463s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:520s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:590s fi-skl-6260u total:288 pass:267 dwarn:1 dfail:0 fail:0 skip:20 time:431s fi-skl-6600u total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:530s fi-skl-6700hq total:288 pass:261 dwarn:1 dfail:0 fail:0 skip:26 time:554s fi-skl-6700k total:288 pass:262 dwarn:1 dfail:0 fail:1 skip:24 time:500s fi-skl-6770hq total:288 pass:267 dwarn:1 dfail:0 fail:0 skip:20 time:477s fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:546s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:415s Blacklisted hosts: fi-cfl-s2 total:288 pass:261 dwarn:1 dfail:0 fail:0 skip:26 time:594s fi-cnl-y total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:618s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:497s
1a0d67efb4cc5611887c79adc5c3315790f78df5 drm-tip: 2017y-12m-06d-00h-51m-07s UTC integration manifest 3049aef5f08d HAX enable GuC/HuC load10f89071cff1 drm/i915/huc: Load HuC only if requested01dfa8983efe drm/i915/guc: Combine enable_guc_loading|submission modparams 7cf1efee816b drm/i915/uc: Don't use -EIO to report missing firmwared13867491486 drm/i915/uc: Don't fetch GuC firmware if no plan to use GuC 86c73ebb4b4e drm/i915/guc: Introduce USES_GUC_xxx helper macros170097291dd4 drm/i915/guc: Move firmware selection to init_early3d98190ec20f drm/i915/huc: Move firmware selection to init_early
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7428/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx