diff --git a/drivers/gpu/nvgpu/common/gr/global_ctx.c b/drivers/gpu/nvgpu/common/gr/global_ctx.c
index c52f5f62e..bdd98f04e 100644
--- a/drivers/gpu/nvgpu/common/gr/global_ctx.c
+++ b/drivers/gpu/nvgpu/common/gr/global_ctx.c
@@ -306,8 +306,10 @@ void nvgpu_gr_global_ctx_deinit_local_golden_image(struct gk20a *g,
 	nvgpu_kfree(g, local_golden_image);
 }
 
+#ifdef CONFIG_NVGPU_DEBUGGER
 u32 *nvgpu_gr_global_ctx_get_local_golden_image_ptr(
 	struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image)
 {
 	return local_golden_image->context;
 }
+#endif
diff --git a/drivers/gpu/nvgpu/common/gr/obj_ctx.c b/drivers/gpu/nvgpu/common/gr/obj_ctx.c
index 7d6369132..3f80ea736 100644
--- a/drivers/gpu/nvgpu/common/gr/obj_ctx.c
+++ b/drivers/gpu/nvgpu/common/gr/obj_ctx.c
@@ -680,12 +680,14 @@ size_t nvgpu_gr_obj_ctx_get_golden_image_size(
 	return golden_image->size;
 }
 
+#ifdef CONFIG_NVGPU_DEBUGGER
 u32 *nvgpu_gr_obj_ctx_get_local_golden_image_ptr(
 	struct nvgpu_gr_obj_ctx_golden_image *golden_image)
 {
 	return nvgpu_gr_global_ctx_get_local_golden_image_ptr(
 			golden_image->local_golden_image);
 }
+#endif
 
 bool nvgpu_gr_obj_ctx_is_golden_image_ready(
 	struct nvgpu_gr_obj_ctx_golden_image *golden_image)
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/global_ctx.h b/drivers/gpu/nvgpu/include/nvgpu/gr/global_ctx.h
index 640510da3..d8bbcf165 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/global_ctx.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/global_ctx.h
@@ -88,7 +88,8 @@ void nvgpu_gr_global_ctx_load_local_golden_image(struct gk20a *g,
 	struct nvgpu_mem *target_mem);
 void nvgpu_gr_global_ctx_deinit_local_golden_image(struct gk20a *g,
 	struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image);
+#ifdef CONFIG_NVGPU_DEBUGGER
 u32 *nvgpu_gr_global_ctx_get_local_golden_image_ptr(
 	struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image);
-
+#endif
 #endif /* NVGPU_GR_GLOBAL_CTX_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h b/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h
index 9459919b1..7cf9736ce 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/obj_ctx.h
@@ -83,8 +83,10 @@ void nvgpu_gr_obj_ctx_set_golden_image_size(
 size_t nvgpu_gr_obj_ctx_get_golden_image_size(
 		struct nvgpu_gr_obj_ctx_golden_image *golden_image);
 
+#ifdef CONFIG_NVGPU_DEBUGGER
 u32 *nvgpu_gr_obj_ctx_get_local_golden_image_ptr(
 	struct nvgpu_gr_obj_ctx_golden_image *golden_image);
+#endif
 
 bool nvgpu_gr_obj_ctx_is_golden_image_ready(
 	struct nvgpu_gr_obj_ctx_golden_image *golden_image);