diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-25 13:16:12 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-25 21:51:49 +0100 |
| commit | 80debff8d9afbf649a15c7ecb0c2cdeb89b36231 (patch) | |
| tree | e89fd3d89cd92d5b8bc659e74c2aa6d828849938 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | b2241f182aa0942749e7c95eca92b840ab93263b (diff) | |
| download | op-kernel-dev-80debff8d9afbf649a15c7ecb0c2cdeb89b36231.zip op-kernel-dev-80debff8d9afbf649a15c7ecb0c2cdeb89b36231.tar.gz | |
drm/i915: Consolidate #ifdef CONFIG_INTEL_IOMMU
We depend on intel_iommu_gfx_mapped for various workarounds, but that is
only available under an #ifdef CONFIG_INTEL_IOMMU. Refactor all the
cut-and-paste ifdefs to a common routine.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170525121612.2190-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a5a01b6..9ba2242 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2997,23 +2997,24 @@ intel_info(const struct drm_i915_private *dev_priv) #include "i915_trace.h" -static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) +static inline bool intel_vtd_active(void) { #ifdef CONFIG_INTEL_IOMMU - if (INTEL_GEN(dev_priv) >= 6 && intel_iommu_gfx_mapped) + if (intel_iommu_gfx_mapped) return true; #endif return false; } +static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv) +{ + return INTEL_GEN(dev_priv) >= 6 && intel_vtd_active(); +} + static inline bool intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv) { -#ifdef CONFIG_INTEL_IOMMU - if (IS_BROXTON(dev_priv) && intel_iommu_gfx_mapped) - return true; -#endif - return false; + return IS_BROXTON(dev_priv) && intel_vtd_active(); } int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv, |
