diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 36a54d456630..f9eb851f72bc 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -6,3 +6,6 @@ obj-y			+= host1x/ drm/ vga/
 obj-$(CONFIG_IMX_IPUV3_CORE)	+= ipu-v3/
 obj-$(CONFIG_TRACE_GPU_MEM)		+= trace/
 obj-$(CONFIG_NOVA_CORE)		+= nova-core/
+
+subdir-ccflags-y += -DDEBUG
+
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 13bc4c290b17..cc3bc4b78770 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1906,8 +1906,12 @@ static void edid_block_status_print(enum edid_block_status status,
 				    const struct edid *block,
 				    int block_num)
 {
+	pr_info("EDID: block_status_print, backtrace:");
+	dump_stack();
+
 	switch (status) {
 	case EDID_BLOCK_OK:
+		pr_debug("EDID block %d read ok\n", block_num);
 		break;
 	case EDID_BLOCK_READ_FAIL:
 		pr_debug("EDID block %d read failed\n", block_num);
@@ -3576,6 +3580,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto
 
 	mode->type = DRM_MODE_TYPE_DRIVER;
 	drm_mode_set_name(mode);
+	drm_dbg_kms(dev, "EDID: added mode %s\n", mode->name);
 
 	return mode;
 }
@@ -3931,6 +3936,8 @@ static int add_established_modes(struct drm_connector *connector,
 		drm_for_each_detailed_block(drm_edid, do_established_modes,
 					    &closure);
 
+	drm_dbg_kms(dev, "EDID: established %d modes\n", modes + closure.modes);
+
 	return modes + closure.modes;
 }
 
@@ -3987,6 +3994,7 @@ static int add_standard_modes(struct drm_connector *connector,
 					    &closure);
 
 	/* XXX should also look for standard codes in VTB blocks */
+	drm_dbg_kms(connector->dev, "EDID: added %d standard modes\n", modes + closure.modes);
 
 	return modes + closure.modes;
 }
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index c7cb1e3a6434..804660d05146 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -361,8 +361,10 @@ static int vc4_drm_bind(struct device *dev)
 	}
 
 	ret = aperture_remove_all_conflicting_devices(driver->name);
-	if (ret)
+	if (ret) {
+		drm_warn(drm, "Error during aperture_remove_all_conflicting_devices\n");
 		goto err;
+	}
 
 	if (firmware) {
 		ret = rpi_firmware_property(firmware,
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index f5642b3038e4..5f2d30a349ae 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3771,6 +3771,9 @@ static int do_bind_con_driver(const struct consw *csw, int first, int last,
 	struct con_driver *con_driver;
 	int i, j = -1, k = -1, retval = -ENODEV;
 
+	pr_info("Console: do_bind_con_driver, backtrace:");
+	dump_stack();
+
 	if (!try_module_get(owner))
 		return -ENODEV;