summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_uc.c
diff options
context:
space:
mode:
authorMichal Wajdeczko2018-06-28 16:15:20 +0200
committerChris Wilson2018-06-28 23:51:32 +0200
commitc39d2e7e35f6f357e59c7313dab8e90f7d1ff93e (patch)
tree439ea63f08bb258f4bd4409fea7c1d9b4eea2d3d /drivers/gpu/drm/i915/intel_uc.c
parentdrm/i915: Only signal from interrupt when requested (diff)
downloadkernel-qcow2-linux-c39d2e7e35f6f357e59c7313dab8e90f7d1ff93e.tar.gz
kernel-qcow2-linux-c39d2e7e35f6f357e59c7313dab8e90f7d1ff93e.tar.xz
kernel-qcow2-linux-c39d2e7e35f6f357e59c7313dab8e90f7d1ff93e.zip
drm/i915/guc: Use intel_guc_init_misc to hide GuC internals
We will add more init steps to misc phase and there is no need to expose them separately for use in uc_init_misc function. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Reviewed-by: Michel Thierry <michel.thierry@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20180628141522.62788-1-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
-rw-r--r--drivers/gpu/drm/i915/intel_uc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 94e8863bd97c..cd49b4f510f0 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -257,9 +257,7 @@ int intel_uc_init_misc(struct drm_i915_private *i915)
if (!USES_GUC(i915))
return 0;
- intel_guc_init_ggtt_pin_bias(guc);
-
- ret = intel_guc_init_wq(guc);
+ ret = intel_guc_init_misc(guc);
if (ret)
return ret;
@@ -273,7 +271,7 @@ void intel_uc_fini_misc(struct drm_i915_private *i915)
if (!USES_GUC(i915))
return;
- intel_guc_fini_wq(guc);
+ intel_guc_fini_misc(guc);
}
int intel_uc_init(struct drm_i915_private *i915)