xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c

Browse Source 
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>
This commit is contained in:
Arkadiusz Hiler
2017-03-14 15:28:08 +01:00
committed by Joonas Lahtinen
parent 882d1db09b
commit 4c0fed7911
4 changed files with 135 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_huc.c
View File

@@ -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);
}
/**