diff --git a/drivers/gpu/nvgpu/include/nvgpu/debug.h b/drivers/gpu/nvgpu/include/nvgpu/debug.h
index 65f8199b0..7ec1e9313 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/debug.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/debug.h
@@ -1,7 +1,7 @@
 /*
  * GK20A Debug functionality
  *
- * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-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"),
@@ -30,6 +30,8 @@
 struct gk20a;
 struct gpu_ops;
 
+/** @cond DOXYGEN_SHOULD_SKIP_THIS */
+
 struct nvgpu_debug_context {
 	void (*fn)(void *ctx, const char *str);
 	void *ctx;
@@ -63,4 +65,6 @@ static inline void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink
 static inline void gk20a_debug_deinit(struct gk20a *g) {}
 #endif
 
+/** @endcond DOXYGEN_SHOULD_SKIP_THIS */
+
 #endif /* NVGPU_DEBUG_H */
diff --git a/userspace/units/fifo/tsg/nvgpu-tsg.h b/userspace/units/fifo/tsg/nvgpu-tsg.h
index 5d8d0db9d..6a271b961 100644
--- a/userspace/units/fifo/tsg/nvgpu-tsg.h
+++ b/userspace/units/fifo/tsg/nvgpu-tsg.h
@@ -201,7 +201,7 @@ int test_tsg_release(struct unit_module *m,
  *
  * Test Type: Feature
  *
- * Targets: nvgpu_tsg_unbind_channel_check_hw_state
+ * Targets: nvgpu_tsg_unbind_channel_check_hw_state, gk20a_tsg_unbind_channel_check_hw_next
  *
  * Input: test_fifo_init_support() run for this GPU
  *