diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 69555363..307e7637 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2790,6 +2790,8 @@ static bool sna_emit_wait_for_scanline_gen7(struct sna *sna,
 	y2--;
 
 	switch (pipe) {
+	default:
+		assert(0);
 	case 0:
 		event = 1 << (full_height ? 3 : 0);
 		break;
@@ -2934,10 +2936,7 @@ static bool sna_emit_wait_for_scanline_gen2(struct sna *sna,
 	 * always comes in pairs. Don't ask me why. */
 	b[2] = b[0] = MI_LOAD_SCAN_LINES_INCL | pipe << 20;
 	b[3] = b[1] = (y1 << 16) | (y2-1);
-	if (pipe == 0)
-		b[4] = MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW;
-	else
-		b[4] = MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW;
+	b[4] = MI_WAIT_FOR_EVENT | 1 << (1 + 4*pipe);
 
 	return true;
 }