File xen3-patch-3.8 of Package drm

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

 This patch contains the differences between 3.7 and 3.8.

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

---
 drivers/gpu/drm/i915/i915_gem_gtt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1182,7 +1182,7 @@ static void ppgtt_unbind_vma(struct i915
  */
 static inline bool needs_idle_maps(struct drm_device *dev)
 {
-#ifdef CONFIG_INTEL_IOMMU
+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_XEN)
 	/* Query intel_iommu to see if we need the workaround. Presumably that
 	 * was loaded first.
 	 */
@@ -1699,7 +1699,7 @@ static int setup_scratch_page(struct drm
 	get_page(page);
 	set_pages_uc(page, 1);
 
-#ifdef CONFIG_INTEL_IOMMU
+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_XEN)
 	dma_addr = pci_map_page(dev->pdev, page, 0, PAGE_SIZE,
 				PCI_DMA_BIDIRECTIONAL);
 	if (pci_dma_mapping_error(dev->pdev, dma_addr))