WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/Gtt/intel-gtt.c

  * here.
+ *
  * /fairy-tale-mode off
  */
+#include
 #include
 #include
 #include
 #include
 #include
 #include "agp.h"
 #include "intel-agp.h"
 #include
 #include
     bool (*check_flags)(unsigned int flags);
     void (*chipset_flush)(void);
 };
-static struct _intel_private {
-    struct intel_gtt base;
+static struct _intel_private {
     const struct intel_gtt_driver *driver;
     struct pci_dev *pcidev; /* device one */
     struct pci_dev *bridge_dev;
     u8 __iomem *registers;
     void __iomem *i9xx_flush_page;
     char *i81x_gtt_table;
     struct resource ifp_resource;
     int resource_valid;
     struct page *scratch_page;
+	phys_addr_t scratch_page_dma;
 	int refcount;
+	/* Whether i915 needs to use the dmar apis or not. */
+	unsigned int needs_dmar : 1;
+	phys_addr_t gma_bus_addr;
+	/*  Size of memory reserved for graphics by the BIOS */
+	unsigned int stolen_size;
+	/* Total number of gtt entries. */
+	unsigned int gtt_total_entries;
+	/* Part of the gtt that is mappable by the cpu, for those chips where
+	 * this is not the full gtt. */
+	unsigned int gtt_mappable_entries;
 } intel_private;
 #define INTEL_GTT_GEN   intel_private.driver->gen
 #define IS_G33          intel_private.driver->is_g33
 	dma_addr_t dma_addr;
 	page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
 	if (page == NULL)
         return -ENOMEM;
-    intel_private.base.scratch_page_dma = page_to_phys(page);
+		intel_private.scratch_page_dma = page_to_phys(page);
 	intel_private.scratch_page = page;
         return i965_gtt_total_entries();
 	else {
         /* On previous hardware, the GTT size was just what was
          * required to map the aperture.
          */
-        return intel_private.base.gtt_mappable_entries;
+		return intel_private.gtt_mappable_entries;
+    }
+}
 static unsigned int intel_gtt_mappable_entries(void)
     ret = intel_private.driver->setup();
     if (ret != 0)
         return ret;
-    intel_private.base.gtt_mappable_entries = intel_gtt_mappable_entries();
+	intel_private.gtt_mappable_entries = intel_gtt_mappable_entries();
-    intel_private.base.gtt_total_entries = intel_gtt_total_entries();
+	intel_private.gtt_total_entries = intel_gtt_total_entries();
     /* save the PGETBL reg for resume */
     if (HAS_PGTBL_EN)
         intel_private.PGETBL_save |= I810_PGETBL_ENABLED;
 	dev_info(&intel_private.bridge_dev->dev,
 			"detected gtt size: %dK total, %dK mappable\n",
-            intel_private.base.gtt_total_entries * 4,
+			intel_private.gtt_total_entries * 4,
-            intel_private.base.gtt_mappable_entries * 4);
+			intel_private.gtt_mappable_entries * 4);
-    gtt_map_size = intel_private.base.gtt_total_entries * 4;
+	gtt_map_size = intel_private.gtt_total_entries * 4;
 	intel_private.gtt = NULL;
 	if (intel_private.gtt == NULL)
 		intel_private.gtt = ioremap(intel_private.gtt_bus_addr,
 					    gtt_map_size);
 	if (intel_private.gtt == NULL) {
         intel_private.driver->cleanup();
-		iounmap(intel_private.registers);
-        return -ENOMEM;
+		iounmap(intel_private.registers);
-    }
+        return -ENOMEM;
-	intel_private.base.gtt = intel_private.gtt;
+    }
     asm volatile("wbinvd");
-    intel_private.base.stolen_size = intel_gtt_stolen_size();
+	intel_private.stolen_size = intel_gtt_stolen_size();
 				      &gma_addr);
 	else
 		pci_read_config_dword(intel_private.pcidev, I915_GMADDR,
 				      &gma_addr);
+	intel_private.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);
 	intel_private.base.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);
     return 0;
 void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries)
+{
 	unsigned int i;
 	for (i = first_entry; i < (first_entry + num_entries); i++) {
-		intel_private.driver->write_entry(intel_private.base.scratch_page_dma,
+		intel_private.driver->write_entry(intel_private.scratch_page_dma,
 						  i, 0);
+	}
 	readl(intel_private.gtt+i-1);
 	/* Shift high bits down */
 	addr |= (addr >> 28) & 0xf0;
 	writel(addr | pte_flags, intel_private.gtt + entry);
+}
-/* Certain Gen5 chipsets require require idling the GPU before
- * unmapping anything from the GTT when VT-d is enabled.
- */
-static inline int needs_idle_maps(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 int i9xx_setup(void)
+{
 	u32 reg_addr, gtt_addr;
         default:
 		intel_private.gtt_bus_addr = reg_addr + KB(512);
             break;
+        }
-	if (needs_idle_maps())
-		intel_private.base.do_idle_maps = 1;
     intel_i9xx_setup_flush();
 int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
                       struct agp_bridge_data *bridge)
+{
+    int i, mask;
+	/*
+	 * Can be called from the fake agp driver but also directly from
+	 * drm/i915.ko. Hence we need to check whether everything is set up
+	 * already.
-    int i, mask;
+	 */
+	if (intel_private.driver) {
+		intel_private.refcount++;
+		return 1;
+	}
     intel_private.driver = NULL;
     for (i = 0; intel_gtt_chipsets[i].name != NULL; i++) {
         if (find_gmch(intel_gtt_chipsets[i].gmch_chip_id)) {
+    }
     if (!intel_private.driver)
+        return 0;
-        return 0;
+	intel_private.refcount++;
 	if (bridge) {
    		bridge->dev_private_data = &intel_private;
     return 1;
+}
 EXPORT_SYMBOL(intel_gmch_probe);
 void intel_gtt_get(size_t *gtt_total, size_t *stolen_size,
+		   phys_addr_t *mappable_base, unsigned long *mappable_end)
-struct intel_gtt *intel_gtt_get(void)
+{
+	*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;
+	*stolen_size = intel_private.stolen_size;
 	*mappable_base = intel_private.gma_bus_addr;
-    return &intel_private.base;
+	*mappable_end = intel_private.gtt_mappable_entries << PAGE_SHIFT;
+}
 EXPORT_SYMBOL(intel_gtt_get);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/Gtt/intel-gtt.c – Rev 3243 → 3480