diff --git a/drivers/gpu/nvgpu/common/rc/rc.c b/drivers/gpu/nvgpu/common/rc/rc.c
index 4e5a64715..9dd868e23 100644
--- a/drivers/gpu/nvgpu/common/rc/rc.c
+++ b/drivers/gpu/nvgpu/common/rc/rc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2021, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,17 +23,18 @@
 #include <nvgpu/log.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/fifo.h>
+#ifdef CONFIG_NVGPU_RECOVERY
 #include <nvgpu/engines.h>
 #include <nvgpu/debug.h>
+#include <nvgpu/nvgpu_err.h>
+#include <nvgpu/gr/gr.h>
+#include <nvgpu/gr/gr_instances.h>
+#endif
 #include <nvgpu/channel.h>
 #include <nvgpu/tsg.h>
 #include <nvgpu/error_notifier.h>
-#include <nvgpu/nvgpu_err.h>
 #include <nvgpu/pbdma_status.h>
-#include <nvgpu/debug.h>
 #include <nvgpu/rc.h>
-#include <nvgpu/gr/gr.h>
-#include <nvgpu/gr/gr_instances.h>
 
 void nvgpu_rc_fifo_recover(struct gk20a *g, u32 eng_bitmask,
 			u32 hw_id, bool id_is_tsg,
diff --git a/drivers/gpu/nvgpu/include/nvgpu/rc.h b/drivers/gpu/nvgpu/include/nvgpu/rc.h
index c2d1feb61..466a341e1 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/rc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/rc.h
@@ -163,8 +163,8 @@ void nvgpu_rc_ctxsw_timeout(struct gk20a *g, u32 eng_bitmask,
  * @param error_notifier [in]	Error notifier type to be set.
  * @param pbdma_status [in]	Pointer to PBDMA status info.
  *
- * Do PBDMA fault recovery. For safety, just set error notifier as per
- * \a error_notifier and print warning if quiesce is not triggered already.
+ * Do PBDMA fault recovery. Set error notifier as per \a error_notifier and call
+ * \a nvgpu_rc_tsg_and_related_engines to do the recovery.
  */
 void nvgpu_rc_pbdma_fault(struct gk20a *g, u32 pbdma_id, u32 error_notifier,
 			struct nvgpu_pbdma_status_info *pbdma_status);