diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 111b932cf2a9..238d914d18c5 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -270,10 +270,10 @@ void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
 	vaf.va = &args;
 
 	if (dev)
-		dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
+		dev_printk(KERN_INFO, dev, "[" DRM_NAME ":%ps] %pV",
 			   __builtin_return_address(0), &vaf);
 	else
-		printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+		printk(KERN_INFO "[" DRM_NAME ":%ps] %pV",
 		       __builtin_return_address(0), &vaf);
 
 	va_end(args);
@@ -292,7 +292,7 @@ void __drm_dbg(enum drm_debug_category category, const char *format, ...)
 	vaf.fmt = format;
 	vaf.va = &args;
 
-	printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+	printk(KERN_INFO "[" DRM_NAME ":%ps] %pV",
 	       __builtin_return_address(0), &vaf);
 
 	va_end(args);
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index ac85e17428f8..0d32e8cfd1da 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -15,10 +15,17 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
 	struct vkms_crtc_state *state;
 	u64 ret_overrun;
 	bool ret;
+	const ktime_t interval = output->period_ns;
+	const ktime_t now = output->vblank_hrtimer.base->get_time();
 
 	ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer,
-					  output->period_ns);
-	WARN_ON(ret_overrun != 1);
+					  interval);
+	if (ret_overrun != 1) {
+		printk(KERN_INFO "now=%llu interval=%llu ret_overrun=%llu\n",
+		       (unsigned long long) now, (unsigned long long) interval,
+		       (unsigned long long) ret_overrun);
+		WARN_ON(1);
+	}
 
 	spin_lock(&output->lock);
 	ret = drm_crtc_handle_vblank(crtc);
@@ -64,6 +71,8 @@ static int vkms_enable_vblank(struct drm_crtc *crtc)
 	hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
 	out->vblank_hrtimer.function = &vkms_vblank_simulate;
 	out->period_ns = ktime_set(0, vblank->framedur_ns);
+	printk(KERN_INFO "Starting out->vblank_hrtimer : out->period_ns=%llu vblank->framedur_ns=%llu\n",
+	       (unsigned long long) out->period_ns, (unsigned long long) vblank->framedur_ns);
 	hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL);
 
 	return 0;
@@ -73,6 +82,7 @@ static void vkms_disable_vblank(struct drm_crtc *crtc)
 {
 	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
 
+	printk(KERN_INFO "Canceling out->vblank_hrtimer\n");
 	hrtimer_cancel(&out->vblank_hrtimer);
 }
 
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index ca7cee8e728a..d565853a4d95 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -317,7 +317,7 @@ enum drm_debug_category {
 
 static inline bool drm_debug_enabled(enum drm_debug_category category)
 {
-	return unlikely(__drm_debug & category);
+	return true;
 }
 
 /*
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 21d9c5f6e7ec..ba487e070cba 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -240,14 +240,7 @@ config DEBUG_INFO_DWARF4
 	  variables in gdb on optimized code.
 
 config DEBUG_INFO_BTF
-	bool "Generate BTF typeinfo"
-	depends on DEBUG_INFO
-	depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
-	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
-	help
-	  Generate deduplicated BTF type information from DWARF debug info.
-	  Turning this on expects presence of pahole tool, which will convert
-	  DWARF type info into equivalent deduplicated BTF type info.
+	def_bool n
 
 config GDB_SCRIPTS
 	bool "Provide GDB scripts for kernel debugging"