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/i915_gem_gtt.c | |
| parent | ca7b2c1bbede6187342dd0bec8666ab4481fa6ad (diff) | |
| download | talos-op-linux-84b1ca2f0e68e89186f552ab839dc8da7c3ddc87.tar.gz talos-op-linux-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/i915_gem_gtt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 6da564e27a64..1e3ccdf7fe1b 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3333,10 +3333,8 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv) return 0; } -void i915_ggtt_enable_guc(struct drm_i915_private *i915) +void i915_ggtt_enable_guc(struct i915_ggtt *ggtt) { - struct i915_ggtt *ggtt = &i915->ggtt; - GEM_BUG_ON(ggtt->invalidate != gen6_ggtt_invalidate); ggtt->invalidate = guc_ggtt_invalidate; @@ -3344,10 +3342,8 @@ void i915_ggtt_enable_guc(struct drm_i915_private *i915) ggtt->invalidate(ggtt); } -void i915_ggtt_disable_guc(struct drm_i915_private *i915) +void i915_ggtt_disable_guc(struct i915_ggtt *ggtt) { - struct i915_ggtt *ggtt = &i915->ggtt; - /* XXX Temporary pardon for error unload */ if (ggtt->invalidate == gen6_ggtt_invalidate) return; |
