[PATCH 2/4] drm/i915/guc: Move firmware selection to early_init
Sagar Arun Kamble
sagar.a.kamble at intel.com
Thu Nov 30 06:50:45 UTC 2017
Looks fine overall. One suggestion:
Can we either have names as
guc_fw_select, huc_fw_select, intel_uc_fw_selected or
guc_fw_define, huc_fw_define, intel_uc_fw_defined
On 11/29/2017 10:57 PM, Michal Wajdeczko wrote:
> 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.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
> 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 | 13 +++-----
> drivers/gpu/drm/i915/intel_uc_fw.h | 5 +++
> 5 files changed, 48 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
> index 823d0c2..8136478 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
> index bbab4e1..0745936 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -56,45 +56,54 @@ MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
>
> #define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
>
> -/**
> - * intel_guc_fw_select() - selects GuC firmware for uploading
> - *
> - * @guc: intel_guc struct
> - *
> - * Return: zero when we know firmware, non-zero in other case
> - */
> -int intel_guc_fw_select(struct intel_guc *guc)
> +static void guc_fw_select(struct intel_uc_fw *guc_fw)
> {
> + struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
> struct drm_i915_private *dev_priv = guc_to_i915(guc);
>
> - intel_uc_fw_init(&guc->fw, INTEL_UC_FW_TYPE_GUC);
> + GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);
> +
> + if (!HAS_GUC(dev_priv))
> + return;
>
> if (i915_modparams.guc_firmware_path) {
> - guc->fw.path = i915_modparams.guc_firmware_path;
> - guc->fw.major_ver_wanted = 0;
> - guc->fw.minor_ver_wanted = 0;
> + guc_fw->path = i915_modparams.guc_firmware_path;
> + guc_fw->major_ver_wanted = 0;
> + guc_fw->minor_ver_wanted = 0;
> } else if (IS_SKYLAKE(dev_priv)) {
> - guc->fw.path = I915_SKL_GUC_UCODE;
> - guc->fw.major_ver_wanted = SKL_FW_MAJOR;
> - guc->fw.minor_ver_wanted = SKL_FW_MINOR;
> + guc_fw->path = I915_SKL_GUC_UCODE;
> + guc_fw->major_ver_wanted = SKL_FW_MAJOR;
> + guc_fw->minor_ver_wanted = SKL_FW_MINOR;
> } else if (IS_BROXTON(dev_priv)) {
> - guc->fw.path = I915_BXT_GUC_UCODE;
> - guc->fw.major_ver_wanted = BXT_FW_MAJOR;
> - guc->fw.minor_ver_wanted = BXT_FW_MINOR;
> + guc_fw->path = I915_BXT_GUC_UCODE;
> + guc_fw->major_ver_wanted = BXT_FW_MAJOR;
> + guc_fw->minor_ver_wanted = BXT_FW_MINOR;
> } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
> - guc->fw.path = I915_KBL_GUC_UCODE;
> - guc->fw.major_ver_wanted = KBL_FW_MAJOR;
> - guc->fw.minor_ver_wanted = KBL_FW_MINOR;
> + guc_fw->path = I915_KBL_GUC_UCODE;
> + guc_fw->major_ver_wanted = KBL_FW_MAJOR;
> + guc_fw->minor_ver_wanted = KBL_FW_MINOR;
> } else if (IS_GEMINILAKE(dev_priv)) {
> - guc->fw.path = I915_GLK_GUC_UCODE;
> - guc->fw.major_ver_wanted = GLK_FW_MAJOR;
> - guc->fw.minor_ver_wanted = GLK_FW_MINOR;
> + guc_fw->path = I915_GLK_GUC_UCODE;
> + 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;
> + DRM_WARN("%s: No firmware known for this platform!\n",
> + intel_uc_fw_type_repr(guc_fw->type));
> }
> +}
>
> - return 0;
> +/**
> + * intel_guc_fw_init_early() - initializes GuC firmware struct
> + * @guc: intel_guc struct
> + *
> + * On platforms with GuC selects firmware for uploading
> + */
> +void intel_guc_fw_init_early(struct intel_guc *guc)
> +{
> + struct intel_uc_fw *guc_fw = &guc->fw;
> +
> + intel_uc_fw_init(guc_fw, INTEL_UC_FW_TYPE_GUC);
> + guc_fw_select(guc_fw);
> }
>
> static void guc_prepare_xfer(struct intel_guc *guc)
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.h b/drivers/gpu/drm/i915/intel_guc_fw.h
> index 023f5ba..4ec5d3d 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.h
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.h
> @@ -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
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 95b524c..ccc89869 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -49,10 +49,13 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)
>
> void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
> {
> - if (!HAS_GUC(dev_priv)) {
> + /* Verify GuC firmware availability */
> + if (!intel_uc_fw_is_defined(&dev_priv->guc.fw)) {
> if (i915_modparams.enable_guc_loading > 0 ||
> i915_modparams.enable_guc_submission > 0)
> - DRM_INFO("Ignoring GuC options, no hardware\n");
> + DRM_INFO("Ignoring GuC options, %s\n",
> + !HAS_GUC(dev_priv) ? "no hardware" :
> + "no firmware");
>
> i915_modparams.enable_guc_loading = 0;
> i915_modparams.enable_guc_submission = 0;
> @@ -63,12 +66,6 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
> if (i915_modparams.enable_guc_loading < 0)
> i915_modparams.enable_guc_loading = HAS_GUC_UCODE(dev_priv);
>
> - /* Verify firmware version */
> - if (i915_modparams.enable_guc_loading) {
> - if (intel_guc_fw_select(&dev_priv->guc))
> - i915_modparams.enable_guc_loading = 0;
> - }
> -
> /* Can't enable guc submission without guc loaded */
> if (!i915_modparams.enable_guc_loading)
> i915_modparams.enable_guc_submission = 0;
> diff --git a/drivers/gpu/drm/i915/intel_uc_fw.h b/drivers/gpu/drm/i915/intel_uc_fw.h
> index 5394d9d..2d4166e 100644
> --- a/drivers/gpu/drm/i915/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/intel_uc_fw.h
> @@ -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_defined(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,
More information about the Intel-gfx-trybot
mailing list