diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c
index bfea5d7d1..367ec2569 100644
--- a/drivers/gpu/nvgpu/common/gr/gr.c
+++ b/drivers/gpu/nvgpu/common/gr/gr.c
@@ -264,8 +264,12 @@ static int gr_init_setup_hw(struct gk20a *g)
 	/*
 	 * Disable both surface and LG coalesce.
 	 */
-	g->ops.gr.init.su_coalesce(g, 0);
-	g->ops.gr.init.lg_coalesce(g, 0);
+	if (g->ops.gr.init.su_coalesce != NULL) {
+		g->ops.gr.init.su_coalesce(g, 0);
+	}
+	if (g->ops.gr.init.lg_coalesce != NULL) {
+		g->ops.gr.init.lg_coalesce(g, 0);
+	}
 
 #ifdef CONFIG_NVGPU_GRAPHICS
 	if (g->ops.gr.init.preemption_state != NULL) {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h b/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h
index ad35aa800..5a4ac587b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops_fuse.h
@@ -189,6 +189,9 @@ struct gops_fuse {
 	int (*read_vin_cal_gain_offset_fuse)(struct gk20a *g,
 					u32 vin_id, s8 *gain,
 					s8 *offset);
+#if defined(CONFIG_NVGPU_HAL_NON_FUSA) && defined(CONFIG_NVGPU_NEXT)
+#include "include/nvgpu/nvgpu_next_gops_fuse.h"
+#endif
 	/** @endcond DOXYGEN_SHOULD_SKIP_THIS */
 };