[Intel-gfx] [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions general. Always initialize action_lock
Arkadiusz Hiler
arkadiusz.hiler at intel.com
Thu Nov 24 10:05:22 UTC 2016
On Thu, Nov 24, 2016 at 09:28:14AM +0100, Arkadiusz Hiler wrote:
> On Wed, Nov 23, 2016 at 02:27:36PM -0800, Anusha Srivatsa wrote:
> > From: Peter Antoine <peter.antoine at intel.com>
> >
> > Rename some of the GuC fw loading code to make them more general. We
> > will utilise them for HuC loading as well.
> > s/intel_guc_fw/intel_uc_fw/g
> > s/GUC_FIRMWARE/UC_FIRMWARE/g
> >
> > Struct intel_guc_fw is renamed to intel_uc_fw. Prefix of tts members,
> > such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for
> > same purpose.
> >
> > Action lock is not being initialized if the GuC submission is disabled
> > (i.e. i915.guc_submission=0).
> >
> > host2guc_action(), which uses the action_lock can be used for
> > non-submission purposes, e.g. triggering HuC authentication.
> >
> > Moving action_lock initialization before enablement check will allow us
> > to use the host2guc_action no matter whether submission is enabled or
> > not.
> >
> > v2: rebased on top of nightly.
> > reapplied the search/replace as upstream code as changed.
> > v3: rebased again on drm-nightly.
> > v4: removed G from messages in shared fw fetch function.
> > v5: rebased.
> > v7: rebased.
> > v8: rebased.
> > v9: rebased.
> > v10: rebased.
> > v11: rebased. Added the action_lock initialization fix provided
> > by Arick <arkadiusz.hiler at intel.com>
>
> It's Arek.
>
> >
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>
> > Signed-off-by: Alex Dai <yu.dai at intel.com>
> > Signed-off-by: Peter Antoine <peter.antoine at intel.com>
> > Reviewed-by: Dave Gordon <david.s.gordon at intel.com>
> > Reviewed-by: Jeff McGee <jeff.mcgee at intel.com>
> > Reviewed-by: Carlos Santa <carlos.santa at intel.com>
> > Tested-by: Carlos Santa <carlos.santa at intel.com>
> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
Also why did you carried over my sign off from a different patch?
> > ---
> > drivers/gpu/drm/i915/i915_debugfs.c | 12 +--
> > drivers/gpu/drm/i915/i915_guc_submission.c | 7 +-
> > drivers/gpu/drm/i915/intel_guc.h | 38 +++----
> > drivers/gpu/drm/i915/intel_guc_loader.c | 155 +++++++++++++++--------------
> > 4 files changed, 108 insertions(+), 104 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> > index 3799a12..53305a4 100644
> > --- a/drivers/gpu/drm/i915/i915_debugfs.c
> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> > @@ -2358,7 +2358,7 @@ static int i915_llc(struct seq_file *m, void *data)
> > static int i915_guc_load_status_info(struct seq_file *m, void *data)
> > {
> > struct drm_i915_private *dev_priv = node_to_i915(m->private);
> > - struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > + struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > u32 tmp, i;
> >
> > if (!HAS_GUC_UCODE(dev_priv))
> > @@ -2366,15 +2366,15 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)
> >
> > seq_printf(m, "GuC firmware status:\n");
> > seq_printf(m, "\tpath: %s\n",
> > - guc_fw->guc_fw_path);
> > + guc_fw->uc_fw_path);
> > seq_printf(m, "\tfetch: %s\n",
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status));
> > + intel_uc_fw_status_repr(guc_fw->fetch_status));
> > seq_printf(m, "\tload: %s\n",
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
> > + intel_uc_fw_status_repr(guc_fw->load_status));
> > seq_printf(m, "\tversion wanted: %d.%d\n",
> > - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted);
> > + guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);
> > seq_printf(m, "\tversion found: %d.%d\n",
> > - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found);
> > + guc_fw->major_ver_found, guc_fw->minor_ver_found);
> > seq_printf(m, "\theader: offset is %d; size = %d\n",
> > guc_fw->header_offset, guc_fw->header_size);
> > seq_printf(m, "\tuCode: offset is %d; size = %d\n",
> > diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> > index 4462112..9947a6d 100644
> > --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> > +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> > @@ -1484,6 +1484,8 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)
> > struct intel_guc *guc = &dev_priv->guc;
> > struct i915_vma *vma;
> >
> > + mutex_init(&guc->action_lock);
> > +
>
> That's pretty much a separate change.
> Why you have merged it into this commit?
>
> Also it makes commit title unbearably long.
>
> > /* Wipe bitmap & delete client in case of reinitialisation */
> > bitmap_clear(guc->doorbell_bitmap, 0, GUC_MAX_DOORBELLS);
> > i915_guc_submission_disable(dev_priv);
> > @@ -1500,7 +1502,6 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)
> >
> > guc->ctx_pool_vma = vma;
> > ida_init(&guc->ctx_ids);
> > - mutex_init(&guc->action_lock);
> > guc_log_create(guc);
> > guc_addon_create(guc);
> >
> > @@ -1583,7 +1584,7 @@ int intel_guc_suspend(struct drm_device *dev)
> > struct i915_gem_context *ctx;
> > u32 data[3];
> >
> > - if (guc->guc_fw.guc_fw_load_status != GUC_FIRMWARE_SUCCESS)
> > + if (guc->guc_fw.load_status != UC_FIRMWARE_SUCCESS)
> > return 0;
> >
> > gen9_disable_guc_interrupts(dev_priv);
> > @@ -1611,7 +1612,7 @@ int intel_guc_resume(struct drm_device *dev)
> > struct i915_gem_context *ctx;
> > u32 data[3];
> >
> > - if (guc->guc_fw.guc_fw_load_status != GUC_FIRMWARE_SUCCESS)
> > + if (guc->guc_fw.load_status != UC_FIRMWARE_SUCCESS)
> > return 0;
> >
> > if (i915.guc_log_level >= 0)
> > diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
> > index 02337a8..6dc328f 100644
> > --- a/drivers/gpu/drm/i915/intel_guc.h
> > +++ b/drivers/gpu/drm/i915/intel_guc.h
> > @@ -91,28 +91,29 @@ struct i915_guc_client {
> > uint64_t submissions[I915_NUM_ENGINES];
> > };
> >
> > -enum intel_guc_fw_status {
> > - GUC_FIRMWARE_FAIL = -1,
> > - GUC_FIRMWARE_NONE = 0,
> > - GUC_FIRMWARE_PENDING,
> > - GUC_FIRMWARE_SUCCESS
> > +enum intel_uc_fw_status {
> > + UC_FIRMWARE_FAIL = -1,
> > + UC_FIRMWARE_NONE = 0,
> > + UC_FIRMWARE_PENDING,
> > + UC_FIRMWARE_SUCCESS
> > };
> >
> > /*
> > * This structure encapsulates all the data needed during the process
> > * of fetching, caching, and loading the firmware image into the GuC.
> > */
> > -struct intel_guc_fw {
> > - const char * guc_fw_path;
> > - size_t guc_fw_size;
> > - struct drm_i915_gem_object * guc_fw_obj;
> > - enum intel_guc_fw_status guc_fw_fetch_status;
> > - enum intel_guc_fw_status guc_fw_load_status;
> > -
> > - uint16_t guc_fw_major_wanted;
> > - uint16_t guc_fw_minor_wanted;
> > - uint16_t guc_fw_major_found;
> > - uint16_t guc_fw_minor_found;
> > +struct intel_uc_fw {
> > + struct drm_device *uc_dev;
> > + const char *uc_fw_path;
> > + size_t uc_fw_size;
> > + struct drm_i915_gem_object *uc_fw_obj;
> > + enum intel_uc_fw_status fetch_status;
> > + enum intel_uc_fw_status load_status;
> > +
> > + uint16_t major_ver_wanted;
> > + uint16_t minor_ver_wanted;
> > + uint16_t major_ver_found;
> > + uint16_t minor_ver_found;
> >
> > uint32_t header_size;
> > uint32_t header_offset;
> > @@ -139,7 +140,7 @@ struct intel_guc_log {
> > };
> >
> > struct intel_guc {
> > - struct intel_guc_fw guc_fw;
> > + struct intel_uc_fw guc_fw;
> > struct intel_guc_log log;
> >
> > /* GuC2Host interrupt related state */
> > @@ -172,9 +173,10 @@ struct intel_guc {
> > extern void intel_guc_init(struct drm_device *dev);
> > extern int intel_guc_setup(struct drm_device *dev);
> > extern void intel_guc_fini(struct drm_device *dev);
> > -extern const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status);
> > +extern const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status);
> > extern int intel_guc_suspend(struct drm_device *dev);
> > extern int intel_guc_resume(struct drm_device *dev);
> > +void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw);
> >
> > /* i915_guc_submission.c */
> > int i915_guc_submission_init(struct drm_i915_private *dev_priv);
> > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
> > index e2d0bda..c1b53a6 100644
> > --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> > @@ -81,16 +81,16 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
> > MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
> >
> > /* User-friendly representation of an enum */
> > -const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
> > +const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
> > {
> > switch (status) {
> > - case GUC_FIRMWARE_FAIL:
> > + case UC_FIRMWARE_FAIL:
> > return "FAIL";
> > - case GUC_FIRMWARE_NONE:
> > + case UC_FIRMWARE_NONE:
> > return "NONE";
> > - case GUC_FIRMWARE_PENDING:
> > + case UC_FIRMWARE_PENDING:
> > return "PENDING";
> > - case GUC_FIRMWARE_SUCCESS:
> > + case UC_FIRMWARE_SUCCESS:
> > return "SUCCESS";
> > default:
> > return "UNKNOWN!";
> > @@ -278,7 +278,7 @@ static inline bool guc_ucode_response(struct drm_i915_private *dev_priv,
> > static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,
> > struct i915_vma *vma)
> > {
> > - struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > + struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > unsigned long offset;
> > struct sg_table *sg = vma->pages;
> > u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT];
> > @@ -350,17 +350,17 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)
> > */
> > static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
> > {
> > - struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > + struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > struct i915_vma *vma;
> > int ret;
> >
> > - ret = i915_gem_object_set_to_gtt_domain(guc_fw->guc_fw_obj, false);
> > + ret = i915_gem_object_set_to_gtt_domain(guc_fw->uc_fw_obj, false);
> > if (ret) {
> > DRM_DEBUG_DRIVER("set-domain failed %d\n", ret);
> > return ret;
> > }
> >
> > - vma = i915_gem_object_ggtt_pin(guc_fw->guc_fw_obj, NULL, 0, 0, 0);
> > + vma = i915_gem_object_ggtt_pin(guc_fw->uc_fw_obj, NULL, 0, 0, 0);
> > if (IS_ERR(vma)) {
> > DRM_DEBUG_DRIVER("pin failed %d\n", (int)PTR_ERR(vma));
> > return PTR_ERR(vma);
> > @@ -451,14 +451,14 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv)
> > int intel_guc_setup(struct drm_device *dev)
> > {
> > struct drm_i915_private *dev_priv = to_i915(dev);
> > - struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > - const char *fw_path = guc_fw->guc_fw_path;
> > + struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > + const char *fw_path = guc_fw->uc_fw_path;
> > int retries, ret, err;
> >
> > DRM_DEBUG_DRIVER("GuC fw status: path %s, fetch %s, load %s\n",
> > fw_path,
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
> > + intel_uc_fw_status_repr(guc_fw->fetch_status),
> > + intel_uc_fw_status_repr(guc_fw->load_status));
> >
> > /* Loading forbidden, or no firmware to load? */
> > if (!i915.enable_guc_loading) {
> > @@ -476,10 +476,10 @@ int intel_guc_setup(struct drm_device *dev)
> > }
> >
> > /* Fetch failed, or already fetched but failed to load? */
> > - if (guc_fw->guc_fw_fetch_status != GUC_FIRMWARE_SUCCESS) {
> > + if (guc_fw->fetch_status != UC_FIRMWARE_SUCCESS) {
> > err = -EIO;
> > goto fail;
> > - } else if (guc_fw->guc_fw_load_status == GUC_FIRMWARE_FAIL) {
> > + } else if (guc_fw->load_status == UC_FIRMWARE_FAIL) {
> > err = -ENOEXEC;
> > goto fail;
> > }
> > @@ -487,11 +487,11 @@ int intel_guc_setup(struct drm_device *dev)
> > guc_interrupts_release(dev_priv);
> > gen9_reset_guc_interrupts(dev_priv);
> >
> > - guc_fw->guc_fw_load_status = GUC_FIRMWARE_PENDING;
> > + guc_fw->load_status = UC_FIRMWARE_PENDING;
> >
> > DRM_DEBUG_DRIVER("GuC fw status: fetch %s, load %s\n",
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
> > + intel_uc_fw_status_repr(guc_fw->fetch_status),
> > + intel_uc_fw_status_repr(guc_fw->load_status));
> >
> > err = i915_guc_submission_init(dev_priv);
> > if (err)
> > @@ -523,11 +523,11 @@ int intel_guc_setup(struct drm_device *dev)
> > "retry %d more time(s)\n", err, retries);
> > }
> >
> > - guc_fw->guc_fw_load_status = GUC_FIRMWARE_SUCCESS;
> > + guc_fw->load_status = UC_FIRMWARE_SUCCESS;
> >
> > DRM_DEBUG_DRIVER("GuC fw status: fetch %s, load %s\n",
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status),
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
> > + intel_uc_fw_status_repr(guc_fw->fetch_status),
> > + intel_uc_fw_status_repr(guc_fw->load_status));
> >
> > if (i915.enable_guc_submission) {
> > if (i915.guc_log_level >= 0)
> > @@ -542,8 +542,8 @@ int intel_guc_setup(struct drm_device *dev)
> > return 0;
> >
> > fail:
> > - if (guc_fw->guc_fw_load_status == GUC_FIRMWARE_PENDING)
> > - guc_fw->guc_fw_load_status = GUC_FIRMWARE_FAIL;
> > + if (guc_fw->load_status == UC_FIRMWARE_PENDING)
> > + guc_fw->load_status = UC_FIRMWARE_FAIL;
> >
> > guc_interrupts_release(dev_priv);
> > i915_guc_submission_disable(dev_priv);
> > @@ -588,7 +588,7 @@ int intel_guc_setup(struct drm_device *dev)
> > return ret;
> > }
> >
> > -static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
> > +void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw)
> > {
> > struct pci_dev *pdev = dev->pdev;
> > struct drm_i915_gem_object *obj;
> > @@ -597,17 +597,17 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
> > size_t size;
> > int err;
> >
> > - DRM_DEBUG_DRIVER("before requesting firmware: GuC fw fetch status %s\n",
> > - intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status));
> > + DRM_DEBUG_DRIVER("before requesting firmware: uC fw fetch status %s\n",
> > + intel_uc_fw_status_repr(uc_fw->fetch_status));
> >
> > - err = request_firmware(&fw, guc_fw->guc_fw_path, &pdev->dev);
> > + err = request_firmware(&fw, uc_fw->uc_fw_path, &pdev->dev);
> > if (err)
> > goto fail;
> > if (!fw)
> > goto fail;
> >
> > - DRM_DEBUG_DRIVER("fetch GuC fw from %s succeeded, fw %p\n",
> > - guc_fw->guc_fw_path, fw);
> > + DRM_DEBUG_DRIVER("fetch uC fw from %s succeeded, fw %p\n",
> > + uc_fw->uc_fw_path, fw);
> >
> > /* Check the size of the blob before examining buffer contents */
> > if (fw->size < sizeof(struct guc_css_header)) {
> > @@ -618,36 +618,36 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
> > css = (struct guc_css_header *)fw->data;
> >
> > /* Firmware bits always start from header */
> > - guc_fw->header_offset = 0;
> > - guc_fw->header_size = (css->header_size_dw - css->modulus_size_dw -
> > + uc_fw->header_offset = 0;
> > + uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw -
> > css->key_size_dw - css->exponent_size_dw) * sizeof(u32);
> >
> > - if (guc_fw->header_size != sizeof(struct guc_css_header)) {
> > + if (uc_fw->header_size != sizeof(struct guc_css_header)) {
> > DRM_NOTE("CSS header definition mismatch\n");
> > goto fail;
> > }
> >
> > /* then, uCode */
> > - guc_fw->ucode_offset = guc_fw->header_offset + guc_fw->header_size;
> > - guc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);
> > + uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size;
> > + uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);
> >
> > /* now RSA */
> > if (css->key_size_dw != UOS_RSA_SCRATCH_MAX_COUNT) {
> > DRM_NOTE("RSA key size is bad\n");
> > goto fail;
> > }
> > - guc_fw->rsa_offset = guc_fw->ucode_offset + guc_fw->ucode_size;
> > - guc_fw->rsa_size = css->key_size_dw * sizeof(u32);
> > + uc_fw->rsa_offset = uc_fw->ucode_offset + uc_fw->ucode_size;
> > + uc_fw->rsa_size = css->key_size_dw * sizeof(u32);
> >
> > /* At least, it should have header, uCode and RSA. Size of all three. */
> > - size = guc_fw->header_size + guc_fw->ucode_size + guc_fw->rsa_size;
> > + size = uc_fw->header_size + uc_fw->ucode_size + uc_fw->rsa_size;
> > if (fw->size < size) {
> > DRM_NOTE("Missing firmware components\n");
> > goto fail;
> > }
> >
> > /* Header and uCode will be loaded to WOPCM. Size of the two. */
> > - size = guc_fw->header_size + guc_fw->ucode_size;
> > + size = uc_fw->header_size + uc_fw->ucode_size;
> > if (size > guc_wopcm_size(to_i915(dev))) {
> > DRM_NOTE("Firmware is too large to fit in WOPCM\n");
> > goto fail;
> > @@ -659,21 +659,21 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
> > * TWO bytes each (i.e. u16), although all pointers and offsets are defined
> > * in terms of bytes (u8).
> > */
> > - guc_fw->guc_fw_major_found = css->guc_sw_version >> 16;
> > - guc_fw->guc_fw_minor_found = css->guc_sw_version & 0xFFFF;
> > -
> > - if (guc_fw->guc_fw_major_found != guc_fw->guc_fw_major_wanted ||
> > - guc_fw->guc_fw_minor_found < guc_fw->guc_fw_minor_wanted) {
> > - DRM_NOTE("GuC firmware version %d.%d, required %d.%d\n",
> > - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found,
> > - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted);
> > + uc_fw->major_ver_found = css->guc_sw_version >> 16;
> > + uc_fw->minor_ver_found = css->guc_sw_version & 0xFFFF;
> > +
> > + if (uc_fw->major_ver_found != uc_fw->major_ver_wanted ||
> > + uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {
> > + DRM_NOTE("uC firmware version %d.%d, required %d.%d\n",
> > + uc_fw->major_ver_found, uc_fw->minor_ver_found,
> > + uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
> > err = -ENOEXEC;
> > goto fail;
> > }
> >
> > DRM_DEBUG_DRIVER("firmware version %d.%d OK (minimum %d.%d)\n",
> > - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found,
> > - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted);
> > + uc_fw->major_ver_found, uc_fw->minor_ver_found,
> > + uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
> >
> > mutex_lock(&dev->struct_mutex);
> > obj = i915_gem_object_create_from_data(dev, fw->data, fw->size);
> > @@ -683,31 +683,31 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
> > goto fail;
> > }
> >
> > - guc_fw->guc_fw_obj = obj;
> > - guc_fw->guc_fw_size = fw->size;
> > + uc_fw->uc_fw_obj = obj;
> > + uc_fw->uc_fw_size = fw->size;
> >
> > - DRM_DEBUG_DRIVER("GuC fw fetch status SUCCESS, obj %p\n",
> > - guc_fw->guc_fw_obj);
> > + DRM_DEBUG_DRIVER("uC fw fetch status SUCCESS, obj %p\n",
> > + uc_fw->uc_fw_obj);
> >
> > release_firmware(fw);
> > - guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_SUCCESS;
> > + uc_fw->fetch_status = UC_FIRMWARE_SUCCESS;
> > return;
> >
> > fail:
> > - DRM_WARN("Failed to fetch valid GuC firmware from %s (error %d)\n",
> > - guc_fw->guc_fw_path, err);
> > - DRM_DEBUG_DRIVER("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n",
> > - err, fw, guc_fw->guc_fw_obj);
> > + DRM_WARN("Failed to fetch valid uC firmware from %s (error %d)\n",
> > + uc_fw->uc_fw_path, err);
> > + DRM_DEBUG_DRIVER("uC fw fetch status FAIL; err %d, fw %p, obj %p\n",
> > + err, fw, uc_fw->uc_fw_obj);
> >
> > mutex_lock(&dev->struct_mutex);
> > - obj = guc_fw->guc_fw_obj;
> > + obj = uc_fw->uc_fw_obj;
> > if (obj)
> > i915_gem_object_put(obj);
> > - guc_fw->guc_fw_obj = NULL;
> > + uc_fw->uc_fw_obj = NULL;
> > mutex_unlock(&dev->struct_mutex);
> >
> > release_firmware(fw); /* OK even if fw is NULL */
> > - guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_FAIL;
> > + uc_fw->fetch_status = UC_FIRMWARE_FAIL;
> > }
> >
> > /**
> > @@ -722,7 +722,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
> > void intel_guc_init(struct drm_device *dev)
> > {
> > struct drm_i915_private *dev_priv = to_i915(dev);
> > - struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > + struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > const char *fw_path;
> >
> > if (!HAS_GUC(dev_priv)) {
> > @@ -740,23 +740,24 @@ void intel_guc_init(struct drm_device *dev)
> > fw_path = NULL;
> > } else if (IS_SKYLAKE(dev_priv)) {
> > fw_path = I915_SKL_GUC_UCODE;
> > - guc_fw->guc_fw_major_wanted = SKL_FW_MAJOR;
> > - guc_fw->guc_fw_minor_wanted = SKL_FW_MINOR;
> > + guc_fw->major_ver_wanted = SKL_FW_MAJOR;
> > + guc_fw->minor_ver_wanted = SKL_FW_MINOR;
> > } else if (IS_BROXTON(dev_priv)) {
> > fw_path = I915_BXT_GUC_UCODE;
> > - guc_fw->guc_fw_major_wanted = BXT_FW_MAJOR;
> > - guc_fw->guc_fw_minor_wanted = BXT_FW_MINOR;
> > + guc_fw->major_ver_wanted = BXT_FW_MAJOR;
> > + guc_fw->minor_ver_wanted = BXT_FW_MINOR;
> > } else if (IS_KABYLAKE(dev_priv)) {
> > fw_path = I915_KBL_GUC_UCODE;
> > - guc_fw->guc_fw_major_wanted = KBL_FW_MAJOR;
> > - guc_fw->guc_fw_minor_wanted = KBL_FW_MINOR;
> > + guc_fw->major_ver_wanted = KBL_FW_MAJOR;
> > + guc_fw->minor_ver_wanted = KBL_FW_MINOR;
> > } else {
> > fw_path = ""; /* unknown device */
> > }
> >
> > - guc_fw->guc_fw_path = fw_path;
> > - guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_NONE;
> > - guc_fw->guc_fw_load_status = GUC_FIRMWARE_NONE;
> > + guc_fw->uc_dev = dev;
> > + guc_fw->uc_fw_path = fw_path;
> > + guc_fw->fetch_status = UC_FIRMWARE_NONE;
> > + guc_fw->load_status = UC_FIRMWARE_NONE;
> >
> > /* Early (and silent) return if GuC loading is disabled */
> > if (!i915.enable_guc_loading)
> > @@ -766,9 +767,9 @@ void intel_guc_init(struct drm_device *dev)
> > if (*fw_path == '\0')
> > return;
> >
> > - guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_PENDING;
> > + guc_fw->fetch_status = UC_FIRMWARE_PENDING;
> > DRM_DEBUG_DRIVER("GuC firmware pending, path %s\n", fw_path);
> > - guc_fw_fetch(dev, guc_fw);
> > + intel_uc_fw_fetch(dev, guc_fw);
> > /* status must now be FAIL or SUCCESS */
> > }
> >
> > @@ -779,17 +780,17 @@ void intel_guc_init(struct drm_device *dev)
> > void intel_guc_fini(struct drm_device *dev)
> > {
> > struct drm_i915_private *dev_priv = to_i915(dev);
> > - struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;
> > + struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;
> >
> > mutex_lock(&dev->struct_mutex);
> > guc_interrupts_release(dev_priv);
> > i915_guc_submission_disable(dev_priv);
> > i915_guc_submission_fini(dev_priv);
> >
> > - if (guc_fw->guc_fw_obj)
> > - i915_gem_object_put(guc_fw->guc_fw_obj);
> > - guc_fw->guc_fw_obj = NULL;
> > + if (guc_fw->uc_fw_obj)
> > + i915_gem_object_put(guc_fw->uc_fw_obj);
> > + guc_fw->uc_fw_obj = NULL;
> > mutex_unlock(&dev->struct_mutex);
> >
> > - guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_NONE;
> > + guc_fw->fetch_status = UC_FIRMWARE_NONE;
> > }
> > --
> > 2.7.4
>
> --
> Cheers,
> Arek
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Cheers,
Arek
More information about the Intel-gfx
mailing list