Index: sys/dev/pci/pci_map.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/pci_map.c,v
retrieving revision 1.32
diff -p -u -r1.32 pci_map.c
--- sys/dev/pci/pci_map.c	26 Dec 2014 05:09:03 -0000	1.32
+++ sys/dev/pci/pci_map.c	22 Oct 2015 19:54:54 -0000
@@ -350,12 +350,17 @@ pci_find_rom(const struct pci_attach_arg
 	uint16_t	ptr;
 	int		done = 0;
 
+	printf("pci_find_rom: size %"PRIuMAX"\n", (uintmax_t)sz);
+
 	/*
 	 * no upper bound check; i cannot imagine a 4GB ROM, but
 	 * it appears the spec would allow it!
 	 */
-	if (sz < 1024)
+	if (sz < 1024) {
+		printf("pci_find_rom: size too small: %"PRIuMAX" < 1024",
+		    (uintmax_t)sz);
 		return 1;
+	}
 
 	while (offset < sz && !done){
 		struct pci_rom_header	hdr;
@@ -367,8 +372,11 @@ pci_find_rom(const struct pci_attach_arg
 		    offset + offsetof (struct pci_rom_header, romh_data_ptr));
 
 		/* no warning: quite possibly ROM is simply not populated */
-		if (hdr.romh_magic != PCI_ROM_HEADER_MAGIC)
+		if (hdr.romh_magic != PCI_ROM_HEADER_MAGIC) {
+			printf("pci_find_rom: bad magic: %04"PRIx16"\n",
+			    hdr.romh_magic);
 			return 1;
+		}
 
 		ptr = offset + hdr.romh_data_ptr;
 		
@@ -414,11 +422,15 @@ pci_find_rom(const struct pci_attach_arg
 		}
 		
 		/* last image check */
-		if (rom.rom_indicator & PCI_ROM_INDICATOR_LAST)
+		if (rom.rom_indicator & PCI_ROM_INDICATOR_LAST) {
+			printf("pci_find_rom: rom indicator check failed\n");
 			return 1;
+		}
 
 		/* offset by size */
 		offset += imagesz;
 	}
+
+	printf("pci_find_rom: no rom found\n");
 	return 1;
 }
Index: sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c,v
retrieving revision 1.4
diff -p -u -r1.4 radeon_bios.c
--- sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c	24 Jun 2015 18:23:23 -0000	1.4
+++ sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c	22 Oct 2015 19:54:55 -0000
@@ -56,9 +56,13 @@ static bool igp_read_bios_from_vram(stru
 	resource_size_t size = 256 * 1024; /* ??? */
 #endif
 
+	DRM_ERROR("\n");
+
 	if (!(rdev->flags & RADEON_IS_IGP))
-		if (!radeon_card_posted(rdev))
+		if (!radeon_card_posted(rdev)) {
+			DRM_ERROR("card not posted\n");
 			return false;
+		}
 
 	rdev->bios = NULL;
 #ifdef __NetBSD__
@@ -66,13 +70,23 @@ static bool igp_read_bios_from_vram(stru
 		/* XXX Dunno what type to expect here; fill me in...  */
 		pci_mapreg_type(rdev->pdev->pd_pa.pa_pc,
 		    rdev->pdev->pd_pa.pa_tag, PCI_BAR(0)),
-		0, &bst, &bsh, NULL, &size))
+		0, &bst, &bsh, NULL, &size)) {
+		DRM_ERROR("failed to map PCI BAR 0\n");
 		return false;
+	}
+	DRM_ERROR("igp bios size = %"PRIuMAX"\n", (uintmax_t)size);
+	DRM_ERROR("igp bios[0] = %02"PRIx8"\n", bus_space_read_1(bst, bsh, 0));
+	DRM_ERROR("igp bios[1] = %02"PRIx8"\n", bus_space_read_1(bst, bsh, 1));
+	uint8_t buf[1024];
+	bus_space_read_region_1(bst, bsh, 0, buf, 1024);
+	print_hex_dump(KERN_ERR, " \t", DUMP_PREFIX_NONE, 16, 1, buf, 1024,
+	    false);
 	if ((size == 0) ||
 	    (size < 256 * 1024) ||
 	    (bus_space_read_1(bst, bsh, 0) != 0x55) ||
 	    (bus_space_read_1(bst, bsh, 1) != 0xaa) ||
 	    ((rdev->bios = kmalloc(size, GFP_KERNEL)) == NULL)) {
+		DRM_ERROR("bad-looking vbios or allocation failed\n");
 		bus_space_unmap(bst, bsh, size);
 		return false;
 	}
@@ -113,6 +127,7 @@ static bool radeon_read_bios(struct rade
 	/* XXX: some cards may return 0 for rom size? ddx has a workaround */
 	bios = pci_map_rom(rdev->pdev, &size);
 	if (!bios) {
+		DRM_ERROR("pci_map_rom failed\n");
 		return false;
 	}
 
@@ -130,11 +145,13 @@ static bool radeon_read_bios(struct rade
 	if (size == 0 ||
 	    bus_space_read_1(bst, bsh, 0) != 0x55 ||
 	    bus_space_read_1(bst, bsh, 1) != 0xaa) {
+		DRM_ERROR("bad-looking vbios\n");
 		pci_unmap_rom(rdev->pdev, bios);
 		return false;
 	}
 	rdev->bios = kmalloc(size, GFP_KERNEL);
 	if (rdev->bios == NULL) {
+		DRM_ERROR("allocation failed\n");
 		pci_unmap_rom(rdev->pdev, bios);
 		return false;
 	}
@@ -731,6 +748,7 @@ bool radeon_get_bios(struct radeon_devic
 	}
 	if (r == false || rdev->bios == NULL) {
 		DRM_ERROR("Unable to locate a BIOS ROM\n");
+		panic("no BIOS rom, aughhhh");
 		rdev->bios = NULL;
 		return false;
 	}
Index: sys/external/bsd/drm2/include/linux/pci.h
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/include/linux/pci.h,v
retrieving revision 1.19
diff -p -u -r1.19 pci.h
--- sys/external/bsd/drm2/include/linux/pci.h	24 Jun 2015 19:46:30 -0000	1.19
+++ sys/external/bsd/drm2/include/linux/pci.h	22 Oct 2015 19:54:55 -0000
@@ -483,15 +483,23 @@ pci_map_rom_md(struct pci_dev *pdev)
 	bus_space_handle_t rom_bsh;
 	int error;
 
-	if (PCI_CLASS(pdev->pd_pa.pa_class) != PCI_CLASS_DISPLAY)
+	if (PCI_CLASS(pdev->pd_pa.pa_class) != PCI_CLASS_DISPLAY) {
+		printf("%s: non-display class: %u\n", __func__,
+		    (unsigned)PCI_CLASS(pdev->pd_pa.pa_class));
 		return ENXIO;
-	if (PCI_SUBCLASS(pdev->pd_pa.pa_class) != PCI_SUBCLASS_DISPLAY_VGA)
+	}
+	if (PCI_SUBCLASS(pdev->pd_pa.pa_class) != PCI_SUBCLASS_DISPLAY_VGA) {
+		printf("%s: non-VGA subclass: %u\n", __func__,
+		    (unsigned)PCI_SUBCLASS(pdev->pd_pa.pa_class));
 		return ENXIO;
+	}
 	/* XXX Check whether this is the primary VGA card?  */
 	error = bus_space_map(pdev->pd_pa.pa_memt, rom_base, rom_size,
 	    (BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE), &rom_bsh);
-	if (error)
+	if (error) {
+		printf("%s: failed to map 0xc0000: %d\n", __func__, error);
 		return ENXIO;
+	}
 
 	pdev->pd_rom_bst = pdev->pd_pa.pa_memt;
 	pdev->pd_rom_bsh = rom_bsh;
@@ -513,8 +521,10 @@ pci_map_rom(struct pci_dev *pdev, size_t
 		(BUS_SPACE_MAP_PREFETCHABLE | BUS_SPACE_MAP_LINEAR),
 		&pdev->pd_rom_bst, &pdev->pd_rom_bsh, NULL, &pdev->pd_rom_size)
 	    != 0 &&
-	    pci_map_rom_md(pdev) != 0)
+	    pci_map_rom_md(pdev) != 0) {
+		printf("failed to map PCI ROM\n");
 		return NULL;
+	}
 	pdev->pd_kludges |= NBPCI_KLUDGE_MAP_ROM;
 
 	/* XXX This type is obviously wrong in general...  */
@@ -522,6 +532,7 @@ pci_map_rom(struct pci_dev *pdev, size_t
 		pdev->pd_rom_size, PCI_ROM_CODE_TYPE_X86,
 		&pdev->pd_rom_found_bsh, &pdev->pd_rom_found_size)) {
 		pci_unmap_rom(pdev, NULL);
+		printf("failed to find PCI ROM\n");
 		return NULL;
 	}