WebSVN – Kolibri OS – Diff – /drivers/video/drm/ttm/ttm_bo_util.c

+ *
  **************************************************************************/
 /*
  * Authors: Thomas Hellstrom
  */
+#define iowrite32(v, addr)      writel((v), (addr))
+#define ioread32(addr)          readl(addr)
 #include
 #include
 #include
-#include
+//#include
-#include
+//#include
 #include
 #include
-#include
+//#include
+#include
+#define __pgprot(x)     ((pgprot_t) { (x) } )
+#define PAGE_KERNEL                     __pgprot(3)
+void *vmap(struct page **pages, unsigned int count,
-#include
+           unsigned long flags, pgprot_t prot);
 void ttm_bo_free_old_node(struct ttm_buffer_object *bo)
+{
 		bdev->driver->io_mem_free(bdev, mem);
+}
+EXPORT_SYMBOL(ttm_mem_io_free);
 EXPORT_SYMBOL(ttm_mem_io_free);
 #if 0
 int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
+{
 			list_add_tail(&bo->io_reserve_lru,
 				      &man->io_reserve_lru);
+	}
 	return 0;
+}
+#endif
 void ttm_mem_io_free_vm(struct ttm_buffer_object *bo)
+{
 		addr = mem->bus.addr;
 	} else {
 		if (mem->placement & TTM_PL_FLAG_WC)
 			addr = ioremap_wc(mem->bus.base + mem->bus.offset, mem->bus.size);
 		else
-			addr = ioremap_nocache(mem->bus.base + mem->bus.offset, mem->bus.size);
+            addr = ioremap(mem->bus.base + mem->bus.offset, mem->bus.size);
 		if (!addr) {
 			(void) ttm_mem_io_lock(man, false);
 			ttm_mem_io_free(bdev, mem);
 			ttm_mem_io_unlock(man);
 			return -ENOMEM;
 	if (!d)
 		return -ENOMEM;
-	src = (void *)((unsigned long)src + (page << PAGE_SHIFT));
-#ifdef CONFIG_X86
-	dst = kmap_atomic_prot(d, prot);
-#else
+	src = (void *)((unsigned long)src + (page << PAGE_SHIFT));
-	if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
-		dst = vmap(&d, 1, 0, prot);
-	else
-		dst = kmap(d);
+    dst = (void*)MapIoMem((addr_t)d, 4096, PG_SW);
 #endif
 	if (!dst)
-		return -ENOMEM;
+		return -ENOMEM;
-	memcpy_fromio(dst, src, PAGE_SIZE);
-#ifdef CONFIG_X86
-	kunmap_atomic(dst);
-#else
-	if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
 		vunmap(dst);
-	else
+    memcpy(dst, src, PAGE_SIZE);
 		kunmap(d);
 	if (!s)
 		return -ENOMEM;
-	dst = (void *)((unsigned long)dst + (page << PAGE_SHIFT));
-#ifdef CONFIG_X86
-	src = kmap_atomic_prot(s, prot);
-#else
+	dst = (void *)((unsigned long)dst + (page << PAGE_SHIFT));
-	if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
-		src = vmap(&s, 1, 0, prot);
-	else
-		src = kmap(s);
+    src = (void*)MapIoMem((addr_t)s, 4096, PG_SW);
 #endif
 	if (!src)
-		return -ENOMEM;
+		return -ENOMEM;
-	memcpy_toio(dst, src, PAGE_SIZE);
-#ifdef CONFIG_X86
-	kunmap_atomic(src);
-#else
-	if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL))
 		vunmap(src);
-	else
+    memcpy(dst, src, PAGE_SIZE);
 		kunmap(s);
 		goto out2;
 	/*
 	 * Don't move nonexistent data. Clear destination instead.
 	 */
+	if (old_iomap == NULL &&
+	    (ttm == NULL || (ttm->state == tt_unpopulated &&
+			     !(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)))) {
-	if (old_iomap == NULL && ttm == NULL)
+        memset(new_iomap, 0, new_mem->num_pages*PAGE_SIZE);
+		goto out2;
 		goto out2;
 	/*
 	 * TTM might be null for moves within the same region.
 	return 0;
+}
 pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp)
-{
-#if defined(__i386__) || defined(__x86_64__)
-	if (caching_flags & TTM_PL_FLAG_WC)
-		tmp = pgprot_writecombine(tmp);
-	else if (boot_cpu_data.x86 > 3)
-		tmp = pgprot_noncached(tmp);
-#elif defined(__powerpc__)
-	if (!(caching_flags & TTM_PL_FLAG_CACHED)) {
-		pgprot_val(tmp) |= _PAGE_NO_CACHE;
-		if (caching_flags & TTM_PL_FLAG_UNCACHED)
-			pgprot_val(tmp) |= _PAGE_GUARDED;
-	}
-#endif
-#if defined(__ia64__)
-	if (caching_flags & TTM_PL_FLAG_WC)
-		tmp = pgprot_writecombine(tmp);
-	else
-		tmp = pgprot_noncached(tmp);
-#endif
-#if defined(__sparc__) || defined(__mips__)
-	if (!(caching_flags & TTM_PL_FLAG_CACHED))
-		tmp = pgprot_noncached(tmp);
 #endif
 	return tmp;
+}
 EXPORT_SYMBOL(ttm_io_prot);
 		map->bo_kmap_type = ttm_bo_map_iomap;
 		if (mem->placement & TTM_PL_FLAG_WC)
 			map->virtual = ioremap_wc(bo->mem.bus.base + bo->mem.bus.offset + offset,
 						  size);
 		else
-			map->virtual = ioremap_nocache(bo->mem.bus.base + bo->mem.bus.offset + offset,
+			map->virtual = ioremap(bo->mem.bus.base + bo->mem.bus.offset + offset,
 						       size);
+	}
 	return (!map->virtual) ? -ENOMEM : 0;
+}
 		 * page protection is consistent with the bo.
 		 */
 		map->bo_kmap_type = ttm_bo_map_kmap;
 		map->page = ttm->pages[start_page];
-		map->virtual = kmap(map->page);
+		map->virtual = (void*)MapIoMem(page_to_phys(map->page), 4096, PG_SW);
 	} else {
 		/*
 		 * We need to use vmap to get the desired page protection
 		 * or to make the buffer object look contiguous.
 	switch (map->bo_kmap_type) {
 	case ttm_bo_map_iomap:
 		iounmap(map->virtual);
 		break;
 	case ttm_bo_map_vmap:
-		vunmap(map->virtual);
-		break;
 	case ttm_bo_map_kmap:
-		kunmap(map->page);
+        FreeKernelSpace(map->virtual);
 		break;
 	case ttm_bo_map_premapped:
 		break;
 	default:
 		BUG();
 	new_mem->mm_node = NULL;
 	return 0;
+}
+EXPORT_SYMBOL(ttm_bo_move_accel_cleanup);
+void *vmap(struct page **pages, unsigned int count,
+           unsigned long flags, pgprot_t prot)
+{
+    void *vaddr;
+    char *tmp;
+    int i;
+    vaddr = AllocKernelSpace(count << 12);
+    if(vaddr == NULL)
+        return NULL;
+    for(i = 0, tmp = vaddr; i < count; i++)
+    {
+        MapPage(tmp, page_to_phys(pages[i]), PG_SW);
+        tmp+= 4096;
+    };
+    return vaddr;
+};

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/ttm/ttm_bo_util.c – Rev 4569 → 5078