From: Michał Winiarski <michal.winiarski@intel.com>
Date: Fri, 20 Jan 2017 19:23:47 +0000 (+0100)
Subject: drm/i915/huc: Assert that HuC vma is placed in GuC accessible range
X-Git-Tag: v4.11-rc1~83^2~39^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3139b4a3a24c0a84fed1c1041eb254c858087c72;p=thirdparty%2Fkernel%2Flinux.git

drm/i915/huc: Assert that HuC vma is placed in GuC accessible range

HuC firmware is mapped at GuC accessible range. Let's add an assert to
verify that.

Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170120192348.2049-2-michal.winiarski@intel.com
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index 5edd4f7c3c60c..c144609425f63 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -312,7 +312,7 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
 
 	/* Specify auth action and where public signature is. */
 	data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
-	data[1] = i915_ggtt_offset(vma) + huc->fw.rsa_offset;
+	data[1] = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
 
 	ret = intel_guc_send(guc, data, ARRAY_SIZE(data));
 	if (ret) {