File xen3-patch-3.10 of Package drm

From: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Linux: 3.10
Patch-mainline: 3.10

 This patch contains the differences between 3.9 and 3.10.

Automatically created from "patch-3.10" by xen-port-patches.py
Acked-by: jbeulich@suse.com

---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2179,7 +2179,7 @@ static void intel_disable_primary_hw_pla
 
 static bool need_vtd_wa(struct drm_device *dev)
 {
-#ifdef CONFIG_INTEL_IOMMU
+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_XEN)
 	if (INTEL_INFO(dev)->gen >= 6 && intel_iommu_gfx_mapped)
 		return true;
 #endif