aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorDave Gordon <david.s.gordon@intel.com>2016-05-13 15:36:29 +0100
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>2016-05-23 14:21:52 +0100
commitf09d675f029723981c48603b3f214c71d6e019e8 (patch)
tree6f5973905527968e094dcc5e59f3c692d784c718 /drivers/gpu/drm/i915/i915_gem.c
parent9cce44316a4cc253aec317f12db619d72556e366 (diff)
downloadlinux-stericsson-f09d675f029723981c48603b3f214c71d6e019e8.tar.gz
drm/i915/guc: rename loader entry points
The GuC initialisation code could do other things apart from loading firmware, so here we rename the three primary entry points to remove any specific reference to "ucode" (no functional changes, just renaming). Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 3251decf10f5..261b7e91f34c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4884,7 +4884,7 @@ i915_gem_init_hw(struct drm_device *dev)
/* We can't enable contexts until all firmware is loaded */
if (HAS_GUC_UCODE(dev)) {
- ret = intel_guc_ucode_load(dev);
+ ret = intel_guc_setup(dev);
if (ret) {
DRM_ERROR("Failed to initialize GuC, error %d\n", ret);
ret = -EIO;