diff options
| author | Daniele Ceraolo Spurio | 2019-03-19 19:35:36 +0100 |
|---|---|---|
| committer | Chris Wilson | 2019-03-20 22:12:31 +0100 |
| commit | 3ceea6a1b4d2426b49a9ebcc099cc147dc68e20b (patch) | |
| tree | 1c9b8b988a4fad799f95ea19eba7d5af836cefce /drivers/gpu/drm/i915/intel_guc_fw.c | |
| parent | drm/i915: use intel_uncore in fw get/put internal paths (diff) | |
| download | kernel-qcow2-linux-3ceea6a1b4d2426b49a9ebcc099cc147dc68e20b.tar.gz kernel-qcow2-linux-3ceea6a1b4d2426b49a9ebcc099cc147dc68e20b.tar.xz kernel-qcow2-linux-3ceea6a1b4d2426b49a9ebcc099cc147dc68e20b.zip | |
drm/i915: use intel_uncore for all forcewake get/put
Now that the internal code all works on intel_uncore, flip the
external-facing interface.
v2: fix GVT.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190319183543.13679-4-daniele.ceraolospurio@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_fw.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_guc_fw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c index 13ff7003c6be..792a551450c7 100644 --- a/drivers/gpu/drm/i915/intel_guc_fw.c +++ b/drivers/gpu/drm/i915/intel_guc_fw.c @@ -241,7 +241,7 @@ static int guc_fw_xfer(struct intel_uc_fw *guc_fw, struct i915_vma *vma) GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC); - intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); + intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL); guc_prepare_xfer(guc); @@ -254,7 +254,7 @@ static int guc_fw_xfer(struct intel_uc_fw *guc_fw, struct i915_vma *vma) ret = guc_xfer_ucode(guc, vma); - intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); + intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL); return ret; } |