diff options
| author | Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> | 2019-07-13 11:00:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-13 20:08:44 +0100 |
| commit | 84b1ca2f0e68e89186f552ab839dc8da7c3ddc87 (patch) | |
| tree | a503ad97d8484a70be1d79126196740429fcfddb /drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | |
| parent | ca7b2c1bbede6187342dd0bec8666ab4481fa6ad (diff) | |
| download | linux-stable-84b1ca2f0e68e89186f552ab839dc8da7c3ddc87.tar.gz linux-stable-84b1ca2f0e68e89186f552ab839dc8da7c3ddc87.tar.bz2 linux-stable-84b1ca2f0e68e89186f552ab839dc8da7c3ddc87.zip | |
drm/i915/uc: prefer intel_gt over i915 in GuC/HuC paths
With our HW interface logic moving from i915 to gt and with GuC and HuC
being part of the gt HW, it makes sense to use the intel_gt structure
instead of i915 as our reference object in GuC/HuC paths.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190713100016.8026-9-chris@chris-wilson.co.uk
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c index 06e726ba9863..becfd34a26c1 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c @@ -4,6 +4,7 @@ * Copyright © 2014-2018 Intel Corporation */ +#include "gt/intel_gt.h" #include "intel_huc_fw.h" #include "i915_drv.h" @@ -139,8 +140,7 @@ static void huc_xfer_rsa(struct intel_huc *huc) static int huc_xfer_ucode(struct intel_huc *huc) { struct intel_uc_fw *huc_fw = &huc->fw; - struct drm_i915_private *dev_priv = huc_to_i915(huc); - struct intel_uncore *uncore = &dev_priv->uncore; + struct intel_uncore *uncore = huc_to_gt(huc)->uncore; unsigned long offset = 0; u32 size; int ret; |