diff mbox

[v2,2/2] drm/i915/huc: Assert that HuC vma is placed in GuC accessible range

Message ID 20170120152824.14185-2-michal.winiarski@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michał Winiarski Jan. 20, 2017, 3:28 p.m. UTC
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>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 drivers/gpu/drm/i915/intel_huc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michal Wajdeczko Jan. 20, 2017, 3:49 p.m. UTC | #1
On Fri, Jan 20, 2017 at 04:28:24PM +0100, Michał Winiarski wrote:
> 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>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>

Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_huc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index d1e65fa..43789a8 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) {
> -- 
> 2.9.3
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index d1e65fa..43789a8 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) {