On Wed, Jan 04, 2017 at 05:27:23AM -0800, Anusha Srivatsa wrote: > From: Peter Antoine <peter.antoine@xxxxxxxxx> > > 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. > > 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. > v12: rebased on top of drm-tip > v13: rebased.Updated dev to dev_priv in intel_guc_setup(), guc_fw_getch() > and intel_guc_init(). > v14: rebased. Remove uint32_t fw_type to patch 2. Add INTEL_ prefix for > fields in enum intel_uc_fw_status. Remove uc_dev field since its never > used.Rename uc_fw to just fw and guc_fw to fw to avoid redundency. > v15: rebased. Remove sections of code that were commented and no longer > required. > v16: rebased. Remove uc_fw_ prefix from path and obj fields > in intel_uc_fw struct as suggested by Michal. > > Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> > Cc: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > Signed-off-by: Alex Dai <yu.dai@xxxxxxxxx> > Signed-off-by: Peter Antoine <peter.antoine@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- > drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- > drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++--------------- > drivers/gpu/drm/i915/intel_uc.h | 36 +++---- > 4 files changed, 104 insertions(+), 104 deletions(-) > ...CUT > /* > * 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 { > + const char *uc_fw_path; > + size_t size; > + struct drm_i915_gem_object *uc_fw_obj; Hmm, something must went wrong ... in v16 comment you said that "uc_fw_" is gone, but obviously this is not true ;( Michal > + 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; > @@ -141,7 +141,7 @@ struct intel_guc_log { > }; > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx