summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_huc.c
diff options
context:
space:
mode:
authorArkadiusz Hiler <arkadiusz.hiler@intel.com>2017-03-14 15:28:08 +0100
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>2017-03-15 14:26:30 +0200
commit4c0fed7911fab26c39ab1b125582f28ac3e5622a (patch)
tree7b1d576b6de713082577a45034887468be64e275 /drivers/gpu/drm/i915/intel_huc.c
parent882d1db09bf0631ad94f20e0abf037b3d471a6d5 (diff)
downloadlinux-stable-4c0fed7911fab26c39ab1b125582f28ac3e5622a.tar.gz
linux-stable-4c0fed7911fab26c39ab1b125582f28ac3e5622a.tar.bz2
linux-stable-4c0fed7911fab26c39ab1b125582f28ac3e5622a.zip
drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
The file fits better. Additionally rename it to intel_uc_prepare_fw(), as the function does more than simple fetch. `obj` cleanup in the function is also fixed (i.e. removed). In the fail scenario it was always 'put' but there's no possible flow that initializes the obj properly and then goes to the fail label. v2: remove second declaration, reorder (M. Wajdeczko) v3: non-trivial rebase v4: remove obj cleanup in the fail scenario (C. Wilson) Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_huc.c')
-rw-r--r--drivers/gpu/drm/i915/intel_huc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index e42021dab323..36326cad332f 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -189,7 +189,7 @@ void intel_huc_init(struct drm_i915_private *dev_priv)
DRM_DEBUG_DRIVER("HuC firmware pending, path %s\n", fw_path);
- intel_uc_fw_fetch(dev_priv, huc_fw);
+ intel_uc_prepare_fw(dev_priv, huc_fw);
}
/**