apply dmacoherent patch for arm64

Author: nicholasaiello

drivers/gpu/drm/ttm/ttm_bo_util.c

@@ -348,8 +348,6 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 		.no_wait_gpu = false
 	};
 	struct ttm_tt *ttm = bo->ttm;
-	struct ttm_resource_manager *man =
-			ttm_manager_type(bo->bdev, bo->resource->mem_type);
 	pgprot_t prot;
 	int ret;
 
@@ -359,6 +357,9 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 	if (ret)
 		return ret;
 
+	#ifndef CONFIG_ARM64
+	struct ttm_resource_manager *man =
+			ttm_manager_type(bo->bdev, bo->resource->mem_type);
 	if (num_pages == 1 && ttm->caching == ttm_cached &&
 	    !(man->use_tt && (ttm->page_flags & TTM_TT_FLAG_DECRYPTED))) {
 		/*
@@ -369,7 +370,10 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 		map->bo_kmap_type = ttm_bo_map_kmap;
 		map->page = ttm->pages[start_page];
 		map->virtual = kmap(map->page);
-	} else {
+	}
+	else
+	#endif
+	{
 		/*
 		 * We need to use vmap to get the desired page protection
 		 * or to make the buffer object look contiguous.

drivers/gpu/drm/ttm/ttm_module.c

@@ -62,8 +62,12 @@
 pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp)
 {
 	/* Cached mappings need no adjustment */
-	if (caching == ttm_cached)
+	if (caching == ttm_cached) {
+#ifdef CONFIG_ARM64
+		return pgprot_dmacoherent(tmp);
+#endif
 		return tmp;
+	}
 
 #if defined(__i386__) || defined(__x86_64__)
 	if (caching == ttm_write_combined)

drivers/pci/setup-bus.c

@@ -2389,6 +2389,26 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
 }
 EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);
 
+static void pci_release_resource_type(struct pci_dev *pdev, unsigned long type)
+{
+	int i;
+
+	if (!device_trylock(&pdev->dev))
+		return;
+
+	if (pdev->dev.driver)
+		goto unlock;
+
+	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
+		if (pci_resource_len(pdev, i) &&
+		    !((pci_resource_flags(pdev, i) ^ type) & PCI_RES_TYPE_MASK))
+			pci_release_resource(pdev, i);
+	}
+
+unlock:
+	device_unlock(&pdev->dev);
+}
+
 int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
 {
 	struct pci_dev_resource *dev_res;
@@ -2423,8 +2443,10 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
 
 			pci_info(bridge, "%s %pR: releasing\n", res_name, res);
 
-			if (res->parent)
+			if (res->parent) {
 				release_resource(res);
+			    pci_release_resource_type(bridge, type);
+			}
 			res->start = 0;
 			res->end = 0;
 			break;

drivers/video/fbdev/core/fbmem.c

@@ -463,6 +463,7 @@ static int do_register_framebuffer(struct fb_info *fb_info)
 	if (err < 0)
 		return err;
 
+	fb_info->node = i;
 	refcount_set(&fb_info->count, 1);
 	mutex_init(&fb_info->lock);
 	mutex_init(&fb_info->mm_lock);