diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index d360380..217ceee 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -316,7 +316,7 @@ static int intel_overlay_on(struct intel_overlay *overlay)
 	OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_ON);
 	OUT_RING(overlay->flip_addr | OFC_UPDATE);
 	OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
-	OUT_RING(MI_NOOP);
+	OUT_RING(MI_NOOP | MI_WRITE_NOPID_REG);
 	ADVANCE_LP_RING();
 
 	ret = intel_overlay_do_wait_request(overlay, request, NULL);
@@ -490,7 +490,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
 		}
 
 		OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP);
-		OUT_RING(MI_NOOP);
+		OUT_RING(MI_NOOP | MI_WRITE_NOPID_REG);
 		ADVANCE_LP_RING();
 
 		ret = intel_overlay_do_wait_request(overlay, request,