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

 static struct _intel_private {
     const struct intel_gtt_driver *driver;
     struct pci_dev *pcidev; /* device one */
     struct pci_dev *bridge_dev;
     u8 __iomem *registers;
-    phys_addr_t gtt_bus_addr;
+	phys_addr_t gtt_phys_addr;
     u32 PGETBL_save;
     u32 __iomem *gtt;       /* I915G */
     bool clear_fake_agp; /* on first access via agp, fill with scratch */
     int num_dcache_entries;
     void __iomem *i9xx_flush_page;
 	return true;
+}
 static int intel_gtt_init(void)
-{
 	u32 gma_addr;
     u32 gtt_map_size;
-    int ret;
+	int ret, bar;
     ret = intel_private.driver->setup();
 	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,
+		intel_private.gtt = ioremap(intel_private.gtt_phys_addr,
 					    gtt_map_size);
 	if (intel_private.gtt == NULL) {
         intel_private.driver->cleanup();
 		iounmap(intel_private.registers);
+        return -ENOMEM;
-        return -ENOMEM;
+    }
 #if IS_ENABLED(CONFIG_AGP_INTEL)
 	global_cache_flush();   /* FIXME: ? */
         intel_gtt_cleanup();
         return ret;
+    }
-	if (INTEL_GTT_GEN <= 2)
-		pci_read_config_dword(intel_private.pcidev, I810_GMADDR,
+	if (INTEL_GTT_GEN <= 2)
-				      &gma_addr);
+		bar = I810_GMADR_BAR;
-	else
-		pci_read_config_dword(intel_private.pcidev, I915_GMADDR,
+	else
-				      &gma_addr);
-	intel_private.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK);
+		bar = I915_GMADR_BAR;
 	intel_private.gma_bus_addr = pci_bus_address(intel_private.pcidev, bar);
+	return 0;
     return 0;
 static void i830_write_entry(dma_addr_t addr, unsigned int entry,
+	}
 	readl(intel_private.gtt+j-1);
+}
 EXPORT_SYMBOL(intel_gtt_insert_sg_entries);
 #if IS_ENABLED(CONFIG_AGP_INTEL)
 static void intel_gtt_insert_pages(unsigned int first_entry,
 				   unsigned int num_entries,
 				   struct page **pages,
 				   unsigned int flags)
                           j, flags);
+    }
     readl(intel_private.gtt+j-1);
+}
+static int intel_fake_agp_insert_entries(struct agp_memory *mem,
+					 off_t pg_start, int type)
+{
+	int ret = -EINVAL;
+	if (intel_private.clear_fake_agp) {
+		int start = intel_private.stolen_size / PAGE_SIZE;
+		int end = intel_private.gtt_mappable_entries;
+		intel_gtt_clear_range(start, end - start);
+		intel_private.clear_fake_agp = false;
+	}
+	if (INTEL_GTT_GEN == 1 && type == AGP_DCACHE_MEMORY)
+		return i810_insert_dcache_entries(mem, pg_start, type);
+	if (mem->page_count == 0)
+		goto out;
+	if (pg_start + mem->page_count > intel_private.gtt_total_entries)
+		goto out_err;
+	if (type != mem->type)
+		goto out_err;
+	if (!intel_private.driver->check_flags(type))
+		goto out_err;
+	if (!mem->is_flushed)
+		global_cache_flush();
+	if (intel_private.needs_dmar) {
+		struct sg_table st;
+		ret = intel_gtt_map_memory(mem->pages, mem->page_count, &st);
+		if (ret != 0)
+			return ret;
+		intel_gtt_insert_sg_entries(&st, pg_start, type);
+		mem->sg_list = st.sgl;
+		mem->num_sg = st.nents;
+	} else
+		intel_gtt_insert_pages(pg_start, mem->page_count, mem->pages,
+				       type);
+out:
+	ret = 0;
+out_err:
+	mem->is_flushed = true;
+	return ret;
+}
 #endif
 void intel_gtt_clear_range(unsigned int first_entry, unsigned int num_entries)
 	writel(addr | pte_flags, intel_private.gtt + entry);
+}
 static int i9xx_setup(void)
 {
-	u32 reg_addr, gtt_addr;
+	phys_addr_t reg_addr;
 	int size = KB(512);
-    pci_read_config_dword(intel_private.pcidev, I915_MMADDR, ®_addr);
-    reg_addr &= 0xfff80000;
+	reg_addr = pci_resource_start(intel_private.pcidev, I915_MMADR_BAR);
 	intel_private.registers = ioremap(reg_addr, size);
     if (!intel_private.registers)
-        return -ENOMEM;
+        return -ENOMEM;
-	switch (INTEL_GTT_GEN) {
-	case 3:
+	switch (INTEL_GTT_GEN) {
-        pci_read_config_dword(intel_private.pcidev,
+	case 3:
-                      I915_PTEADDR, >t_addr);
+		intel_private.gtt_phys_addr =
-        intel_private.gtt_bus_addr = gtt_addr;
+			pci_resource_start(intel_private.pcidev, I915_PTE_BAR);
 		break;
         case 5:
-		intel_private.gtt_bus_addr = reg_addr + MB(2);
+		intel_private.gtt_phys_addr = reg_addr + MB(2);
             break;
         default:
     if (!intel_private.driver)
         return 0;
+	intel_private.refcount++;
 	intel_private.refcount++;
+#if IS_ENABLED(CONFIG_AGP_INTEL)
 	if (bridge) {
-	if (bridge) {
+		bridge->driver = &intel_fake_agp_driver;
    		bridge->dev_private_data = &intel_private;
+		bridge->dev = bridge_pdev;
 		bridge->dev = bridge_pdev;
 #endif

Subversion Repositories Kolibri OS

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