Testing PCIe graphics cards on Pi5

arch/arm64/configs/bcm2711_defconfig

@@ -1063,6 +1063,12 @@ CONFIG_AUXDISPLAY=y
 CONFIG_HD44780=m
 CONFIG_DRM=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_XE=m
 CONFIG_DRM_UDL=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
@@ -1619,7 +1625,6 @@ CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_EXFAT_FS=m
 CONFIG_NTFS3_FS=m
-CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_ECRYPT_FS=m
 CONFIG_HFS_FS=m

drivers/gpu/drm/i915/Kconfig

@@ -2,7 +2,7 @@
 config DRM_I915
 	tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
 	depends on DRM
-	depends on X86 && PCI
+	depends on PCI
 	depends on !PREEMPT_RT
 	select INTEL_GTT if X86
 	select INTERVAL_TREE

drivers/gpu/drm/i915/display/intel_display.c

@@ -7636,6 +7636,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
 	 * FIXME: Cut over to (async) commit helpers instead of hand-rolling
 	 * everything.
 	 */
+#if defined(CONFIG_VGA_CONSOLE)
 	if (state->base.legacy_cursor_update) {
 		struct intel_crtc_state *new_crtc_state;
 		struct intel_crtc *crtc;
@@ -7644,7 +7645,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
 		for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
 			complete_all(&new_crtc_state->uapi.commit->flip_done);
 	}
-
+#endif
 	ret = intel_atomic_prepare_commit(state);
 	if (ret) {
 		drm_dbg_atomic(display->drm,

drivers/gpu/drm/i915/display/intel_vga.c

@@ -78,6 +78,7 @@ void intel_vga_disable(struct intel_display *display)
 
 void intel_vga_reset_io_mem(struct intel_display *display)
 {
+#if defined(CONFIG_VGA_CONSOLE)
 	struct pci_dev *pdev = to_pci_dev(display->drm->dev);
 
 	/*
@@ -93,6 +94,7 @@ void intel_vga_reset_io_mem(struct intel_display *display)
 	vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
 	outb(inb(VGA_MIS_R), VGA_MIS_W);
 	vga_put(pdev, VGA_RSRC_LEGACY_IO);
+#endif
 }
 
 int intel_vga_register(struct intel_display *display)

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c

@@ -59,7 +59,7 @@ gk110_fb = {
 	.init = gf100_fb_init,
 	.init_page = gf100_fb_init_page,
 	.intr = gf100_fb_intr,
-	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,
+	//.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,
 	.ram_new = gk104_ram_new,
 	.default_bigpage = 17,
 	.clkgate_pack = gk110_fb_clkgate_pack,

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,17 +357,7 @@ static int ttm_bo_kmap_ttm(struct ttm_buffer_object *bo,
 	if (ret)
 		return ret;
 
-	if (num_pages == 1 && ttm->caching == ttm_cached &&
-	    !(man->use_tt && (ttm->page_flags & TTM_TT_FLAG_DECRYPTED))) {
-		/*
-		 * We're mapping a single page, and the desired
-		 * 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);
-	} else {
+	{
 		/*
 		 * 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,13 @@
 pgprot_t ttm_prot_from_caching(enum ttm_caching caching, pgprot_t tmp)
 {
 	/* Cached mappings need no adjustment */
 	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);