WebSVN – Kolibri OS – Path Comparison – / – /drivers/video/drm/i915/Gtt/ Rev 4103 and /drivers/video/drm/i915/Gtt/ Rev 4104

Regard whitespace Rev 4103 → Rev 4104

 /drivers/video/drm/i915/Gtt/intel-agp.c
 ,7 → 25,7
 #define PCI_DEVICE_ID_INTEL_82945GM_HB  0x27A0
-int intel_gmch_probe(struct pci_dev *pdev,
+int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
                       struct agp_bridge_data *bridge);
 int intel_agp_enabled;
 ,7 → 62,8
     bridge->capndx = cap_ptr;
-    if (intel_gmch_probe(pdev, bridge))
+        if (intel_gmch_probe(pdev, NULL, bridge))
     {
 //        pci_set_drvdata(pdev, bridge);
 //        err = agp_add_bridge(bridge);

 /drivers/video/drm/i915/Gtt/intel-gtt.c
 ,6 → 363,40
         intel_gtt_teardown_scratch_page();
 }
+/* Certain Gen5 chipsets require require idling the GPU before
+ * unmapping anything from the GTT when VT-d is enabled.
+ */
+static inline int needs_ilk_vtd_wa(void)
+{
+#ifdef CONFIG_INTEL_IOMMU
+        const unsigned short gpu_devid = intel_private.pcidev->device;
+        /* Query intel_iommu to see if we need the workaround. Presumably that
+         * was loaded first.
+         */
+        if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB ||
+             gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&
+             intel_iommu_gfx_mapped)
+                return 1;
+#endif
+        return 0;
+}
+static bool intel_gtt_can_wc(void)
+{
+        if (INTEL_GTT_GEN <= 2)
+                return false;
+        if (INTEL_GTT_GEN >= 6)
+                return false;
+        /* Reports of major corruption with ILK vt'd enabled */
+        if (needs_ilk_vtd_wa())
+                return false;
+        return true;
+}
 static int intel_gtt_init(void)
 {
         u32 gma_addr;