diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c
index 58dfe87..85067b2 100644
--- a/sys/dev/pci/pci_map.c
+++ b/sys/dev/pci/pci_map.c
@@ -274,6 +274,7 @@ pci_mapreg_map(const struct pci_attach_args *pa, int reg, pcireg_t type,
     int busflags, bus_space_tag_t *tagp, bus_space_handle_t *handlep,
     bus_addr_t *basep, bus_size_t *sizep)
 {
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 	return pci_mapreg_submap(pa, reg, type, busflags, 0, 0, tagp, 
 	    handlep, basep, sizep);
 }
@@ -288,6 +289,7 @@ pci_mapreg_submap(const struct pci_attach_args *pa, int reg, pcireg_t type,
 	bus_addr_t base;
 	bus_size_t size;
 	int flags;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_IO) {
 		if ((pa->pa_flags & PCI_FLAGS_IO_OKAY) == 0)
@@ -304,6 +306,7 @@ pci_mapreg_submap(const struct pci_attach_args *pa, int reg, pcireg_t type,
 			return 1;
 		tag = pa->pa_memt;
 	}
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	if (reg == PCI_MAPREG_ROM) {
 		pcireg_t 	mask;
@@ -315,6 +318,7 @@ pci_mapreg_submap(const struct pci_attach_args *pa, int reg, pcireg_t type,
 		pci_conf_write(pa->pa_pc, pa->pa_tag, reg, mask);
 		splx(s);
 	}
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	/* If we're called with maxsize/offset of 0, behave like 
 	 * pci_mapreg_map.
@@ -322,9 +326,11 @@ pci_mapreg_submap(const struct pci_attach_args *pa, int reg, pcireg_t type,
 
 	maxsize = (maxsize != 0) ? maxsize : size;
 	base += offset;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	if ((size < maxsize) || (size < (offset + maxsize)))
 		return 1;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	if (bus_space_map(tag, base, maxsize, busflags | flags, &handle))
 		return 1;
@@ -337,6 +343,7 @@ pci_mapreg_submap(const struct pci_attach_args *pa, int reg, pcireg_t type,
 		*basep = base;
 	if (sizep != NULL)
 		*sizep = maxsize;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	return 0;
 }
@@ -356,6 +363,7 @@ pci_find_rom(const struct pci_attach_args *pa, bus_space_tag_t bst,
 	 */
 	if (sz < 1024)
 		return 1;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	while (offset < sz && !done){
 		struct pci_rom_header	hdr;
@@ -394,6 +402,7 @@ pci_find_rom(const struct pci_attach_args *pa, bus_space_tag_t bst,
 		    ptr + offsetof (struct pci_rom, rom_code_type));
 		rom.rom_indicator = bus_space_read_1(bst, bsh,
 		    ptr + offsetof (struct pci_rom, rom_indicator));
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 		if (rom.rom_signature != PCI_ROM_SIGNATURE) {
 			printf("pci_find_rom: bad rom data signature\n");
@@ -402,6 +411,8 @@ pci_find_rom(const struct pci_attach_args *pa, bus_space_tag_t bst,
 
 		imagesz = rom.rom_len * 512;
 
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
+
 		if ((rom.rom_vendor == PCI_VENDOR(pa->pa_id)) &&
 		    (rom.rom_product == PCI_PRODUCT(pa->pa_id)) &&
 		    (rom.rom_class == PCI_CLASS(pa->pa_class)) &&
@@ -412,11 +423,11 @@ pci_find_rom(const struct pci_attach_args *pa, bus_space_tag_t bst,
 			bus_space_subregion(bst, bsh, offset, imagesz, romh);
 			return 0;
 		}
-		
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);		
 		/* last image check */
 		if (rom.rom_indicator & PCI_ROM_INDICATOR_LAST)
 			return 1;
-
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 		/* offset by size */
 		offset += imagesz;
 	}
diff --git a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
index 1a727d1..7783488 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
@@ -323,12 +323,14 @@ bool drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)
 			drm_plane_force_disable(plane);
 
 	for (i = 0; i < fb_helper->crtc_count; i++) {
+	  aprint_normal("%s: %s:%d .. %d \n",__func__, __FILE__,__LINE__, i);
 		struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
 		struct drm_crtc *crtc = mode_set->crtc;
 		int ret;
 
 		if (crtc->funcs->cursor_set) {
 			ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
+			aprint_normal("%s: %s:%d .. %x \n",__func__, __FILE__,__LINE__, ret);
 			if (ret)
 				error = true;
 		}
diff --git a/sys/external/bsd/drm2/dist/drm/drm_stub.c b/sys/external/bsd/drm2/dist/drm/drm_stub.c
index 550a653..e953ec0 100644
--- a/sys/external/bsd/drm2/dist/drm/drm_stub.c
+++ b/sys/external/bsd/drm2/dist/drm/drm_stub.c
@@ -42,7 +42,12 @@
 #include <drm/drmP.h>
 #include <drm/drm_core.h>
 
+#ifdef DEBUG
+unsigned int drm_debug = 1;	/* 1 to enable debug output */
+#else
 unsigned int drm_debug = 0;	/* 1 to enable debug output */
+#endif
+
 EXPORT_SYMBOL(drm_debug);
 
 unsigned int drm_rnodes = 0;	/* 1 to enable experimental render nodes API */
@@ -92,13 +97,13 @@ struct class *drm_class;
 struct dentry *drm_debugfs_root;
 #endif
 
-int drm_err(const char *func, const char *format, ...)
+int drm_err(const char *file_name, const char *func, const char *format, ...)
 {
 #ifdef __NetBSD__
 	va_list args;
 
 	va_start(args, format);
-	printf("DRM error in %s: ", func);
+	printf("DRM error in %s %s: ", file_name, func);
 	vprintf(format, args);
 	va_end(args);
 
@@ -122,13 +127,13 @@ int drm_err(const char *func, const char *format, ...)
 }
 EXPORT_SYMBOL(drm_err);
 
-void drm_ut_debug_printk(const char *function_name, const char *format, ...)
+void drm_ut_debug_printk(const char *file_name, const char *function_name, const char *format, ...)
 {
 #ifdef __NetBSD__
 	va_list args;
 
 	va_start(args, format);
-	printf("DRM debug in %s: ", function_name);
+	printf("DRM debug in %s %s: ", file_name, function_name);
 	vprintf(format, args);
 	va_end(args);
 #else
diff --git a/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c b/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c
index b7b7ffd..d988b4a 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_bios.c
@@ -922,8 +922,10 @@ intel_parse_bios(struct drm_device *dev)
 
 	if (HAS_PCH_NOP(dev))
 		return -ENODEV;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	init_vbt_defaults(dev_priv);
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	/* XXX Should this validation be moved to intel_opregion.c? */
 	if (!dmi_check_system(intel_no_opregion_vbt) && dev_priv->opregion.vbt) {
@@ -935,16 +937,21 @@ intel_parse_bios(struct drm_device *dev)
 		} else
 			dev_priv->opregion.vbt = NULL;
 	}
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	if (bdb == NULL) {
 		struct vbt_header *vbt = NULL;
 		size_t size;
 		int i;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 		bios = pci_map_rom(pdev, &size);
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
+
 		if (!bios)
 			return -1;
 
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 		/* Scour memory looking for the VBT signature */
 		for (i = 0; i + 4 < size; i++) {
 			if (!memcmp(bios + i, "$VBT", 4)) {
diff --git a/sys/external/bsd/drm2/dist/include/drm/drmP.h b/sys/external/bsd/drm2/dist/include/drm/drmP.h
index 682fe5b..f6a4120 100644
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h
@@ -134,11 +134,12 @@ struct videomode;
 #define DRM_UT_KMS		0x04
 #define DRM_UT_PRIME		0x08
 
-extern __printf(2, 3)
-void drm_ut_debug_printk(const char *function_name,
+extern __printf(3, 4)
+void drm_ut_debug_printk(const char *file_name,
+			 const char *function_name,
 			 const char *format, ...);
-extern __printf(2, 3)
-int drm_err(const char *func, const char *format, ...);
+extern __printf(3, 4)
+int drm_err(const char *file_name, const char *func, const char *format, ...);
 
 /***********************************************************************/
 /** \name DRM template customization defaults */
@@ -187,7 +188,7 @@ int drm_err(const char *func, const char *format, ...);
  * \param arg arguments
  */
 #define DRM_ERROR(fmt, ...)				\
-	drm_err(__func__, fmt, ##__VA_ARGS__)
+  drm_err(__FILE__, __func__, fmt, ##__VA_ARGS__)
 
 
 #ifdef __NetBSD__
@@ -230,23 +231,23 @@ int drm_err(const char *func, const char *format, ...);
 #define DRM_DEBUG(fmt, args...)						\
 	do {								\
 		if (unlikely(drm_debug & DRM_UT_CORE))			\
-			drm_ut_debug_printk(__func__, fmt, ##args);	\
+			drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args);	\
 	} while (0)
 
 #define DRM_DEBUG_DRIVER(fmt, args...)					\
 	do {								\
 		if (unlikely(drm_debug & DRM_UT_DRIVER))		\
-			drm_ut_debug_printk(__func__, fmt, ##args);	\
+			drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args);	\
 	} while (0)
 #define DRM_DEBUG_KMS(fmt, args...)					\
 	do {								\
 		if (unlikely(drm_debug & DRM_UT_KMS))			\
-			drm_ut_debug_printk(__func__, fmt, ##args);	\
+			drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args);	\
 	} while (0)
 #define DRM_DEBUG_PRIME(fmt, args...)					\
 	do {								\
 		if (unlikely(drm_debug & DRM_UT_PRIME))			\
-			drm_ut_debug_printk(__func__, fmt, ##args);	\
+			drm_ut_debug_printk(__FILE__, __func__ , fmt, ##args);	\
 	} while (0)
 #else
 #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)
diff --git a/sys/external/bsd/drm2/include/linux/pci.h b/sys/external/bsd/drm2/include/linux/pci.h
index b0425cd..7ced158 100644
--- a/sys/external/bsd/drm2/include/linux/pci.h
+++ b/sys/external/bsd/drm2/include/linux/pci.h
@@ -479,18 +479,27 @@ pci_map_rom_md(struct pci_dev *pdev)
 	const bus_addr_t rom_base = 0xc0000;
 	const bus_size_t rom_size = 0x20000;
 	bus_space_handle_t rom_bsh;
+
 	int error;
 
 	if (PCI_CLASS(pdev->pd_pa.pa_class) != PCI_CLASS_DISPLAY)
 		return ENXIO;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
+
 	if (PCI_SUBCLASS(pdev->pd_pa.pa_class) != PCI_SUBCLASS_DISPLAY_VGA)
 		return ENXIO;
 	/* XXX Check whether this is the primary VGA card?  */
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
+
 	error = bus_space_map(pdev->pd_pa.pa_memt, rom_base, rom_size,
 	    (BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE), &rom_bsh);
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
+
 	if (error)
 		return ENXIO;
 
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
+
 	pdev->pd_rom_bst = pdev->pd_pa.pa_memt;
 	pdev->pd_rom_bsh = rom_bsh;
 	pdev->pd_rom_size = rom_size;
@@ -508,6 +517,7 @@ pci_map_rom(struct pci_dev *pdev, size_t *sizep)
 	bus_size_t size;
 
 	KASSERT(!ISSET(pdev->pd_kludges, NBPCI_KLUDGE_MAP_ROM));
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	if (pci_mapreg_map(&pdev->pd_pa, PCI_MAPREG_ROM, PCI_MAPREG_TYPE_ROM,
 		(BUS_SPACE_MAP_PREFETCHABLE | BUS_SPACE_MAP_LINEAR),
@@ -515,14 +525,16 @@ pci_map_rom(struct pci_dev *pdev, size_t *sizep)
 	    != 0 &&
 	    pci_map_rom_md(pdev) != 0)
 		return NULL;
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 	pdev->pd_kludges |= NBPCI_KLUDGE_MAP_ROM;
-
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 	/* XXX This type is obviously wrong in general...  */
 	if (pci_find_rom(&pdev->pd_pa, pdev->pd_rom_bst, pdev->pd_rom_bsh,
 		pdev->pd_rom_size, PCI_ROM_CODE_TYPE_X86, &bsh, &size)) {
 		pci_unmap_rom(pdev, NULL);
 		return NULL;
 	}
+aprint_normal("%s: %s:%d\n",__func__, __FILE__,__LINE__);
 
 	KASSERT(size <= SIZE_T_MAX);
 	*sizep = size;