From a2b26acc926bd7c9eb74c99043e261a297bc732e Mon Sep 17 00:00:00 2001
From: Qi Yadong <yadong.qi@intel.com>
Date: Tue, 23 Jul 2019 13:15:43 +0800
Subject: [PATCH] [DO-NOT-MERGE]always return true for intel_vtd_active()

Signed-off-by: Qi Yadong <yadong.qi@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ebb9dbaedbb1..48357bbb5f78 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2703,11 +2703,15 @@ intel_info(const struct drm_i915_private *dev_priv)
 
 static inline bool intel_vtd_active(void)
 {
+#if 0
 #ifdef CONFIG_INTEL_IOMMU
 	if (intel_iommu_gfx_mapped)
 		return true;
 #endif
 	return false;
+#else
+	return true;
+#endif
 }
 
 static inline bool intel_scanout_needs_vtd_wa(struct drm_i915_private *dev_priv)