diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index ac85e17428f8..d071c517480d 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);
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"