drm/i915/guc: Make the GuC fw loading helper functions general
Subsystems (2)
PATCH 1/6 drm/i915/guc: Make the GuC fw loading helper functions general
From: Alex Dai <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilize 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.
Signed-off-by Alex Dai <[email protected]>
Signed-off-by Peter Antoine <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/intel_guc.h | 39 +++---- drivers/gpu/drm/i915/intel_guc_loader.c | 181 +++++++++++++++++--------------- 3 files changed, 122 insertions(+), 110 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -2410,7 +2410,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) {struct drm_info_node *node = m->private;struct drm_i915_private *dev_priv = node->minor->dev->dev_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->dev))
@@ -2418,15 +2418,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",
drivers/gpu/drm/i915/intel_guc.h +20 -19
@@ -52,29 +52,29 @@ struct i915_guc_client {int retcode; }; -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 { -struct drm_device * guc_dev; -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;
@@ -85,7 +85,7 @@ struct intel_guc_fw { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw guc_fw;uint32_t log_flags;struct drm_i915_gem_object *log_obj;
@@ -114,9 +114,10 @@ struct intel_guc {extern void intel_guc_ucode_init (struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);extern void intel_guc_ucode_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_device *dev);
drivers/gpu/drm/i915/intel_guc_loader.c +96 -85
380 lines not on this page · raw message
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx