diff options
| author | Fernando Pacheco <fernando.pacheco@intel.com> | 2019-04-19 16:00:11 -0700 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-04-20 08:18:52 +0100 |
| commit | 95ebcda3ef4fa2c928e2e0dbe0f707ca90852110 (patch) | |
| tree | 9c6975ceeb90c33e92f70522edc9c30ad7f7c0a9 /drivers/gpu/drm/i915/intel_uc_fw.h | |
| parent | 267e80ee6a341bc694406ef7c4f30fa2721610b7 (diff) | |
| download | kernel_replicant_linux-95ebcda3ef4fa2c928e2e0dbe0f707ca90852110.tar.gz kernel_replicant_linux-95ebcda3ef4fa2c928e2e0dbe0f707ca90852110.tar.bz2 kernel_replicant_linux-95ebcda3ef4fa2c928e2e0dbe0f707ca90852110.zip | |
drm/i915/uc: Rename uC firmware init/fini functions
he uC firmware init function is called during GuC/HuC init early phases.
Rename to include "_early" and properly reflect which phase we are at.
The uC firmware fini function is cleaning up the state set/created on
firmware fetch. Replace "_fini" with "_cleanup_fetch".
v2: also rename uC fw fini function
Signed-off-by: Fernando Pacheco <fernando.pacheco@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190419230015.18121-2-fernando.pacheco@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc_fw.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc_fw.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc_fw.h b/drivers/gpu/drm/i915/intel_uc_fw.h index 0e3bd580e267..e6fa8599757c 100644 --- a/drivers/gpu/drm/i915/intel_uc_fw.h +++ b/drivers/gpu/drm/i915/intel_uc_fw.h @@ -102,7 +102,8 @@ static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type) } static inline -void intel_uc_fw_init(struct intel_uc_fw *uc_fw, enum intel_uc_fw_type type) +void intel_uc_fw_init_early(struct intel_uc_fw *uc_fw, + enum intel_uc_fw_type type) { uc_fw->path = NULL; uc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE; @@ -144,10 +145,10 @@ static inline u32 intel_uc_fw_get_upload_size(struct intel_uc_fw *uc_fw) void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, struct intel_uc_fw *uc_fw); +void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw); int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, int (*xfer)(struct intel_uc_fw *uc_fw, struct i915_vma *vma)); -void intel_uc_fw_fini(struct intel_uc_fw *uc_fw); void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct drm_printer *p); #endif |