From 0f5c2376123a8592d9b05167327c67e4cd5e1564 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Mon, 12 Dec 2022 00:03:03 +0100
Subject: ZEN: INTERACTIVE: Use Kyber as the elevator for MQ devices

---
 block/elevator.c | 6 ++++++
 init/Kconfig     | 1 +
 2 files changed, 7 insertions(+)

--- a/block/elevator.c
+++ b/block/elevator.c
@@ -762,7 +762,13 @@ void elevator_set_default(struct request
 	 * to "none".
 	 */
 	if (q->nr_hw_queues != 1 && !blk_mq_is_shared_tags(q->tag_set->flags))
+#if defined(CONFIG_ZEN_INTERACTIVE) && defined(CONFIG_MQ_IOSCHED_KYBER)
+		ctx.name = "kyber";
+#elif defined(CONFIG_ZEN_INTERACTIVE)
+		ctx.name = "mq-deadline";
+#else
 		return;
+#endif
 
 	e = elevator_find_get(ctx.name);
 	if (!e)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -176,6 +176,7 @@ config ZEN_INTERACTIVE
 	  --- Block Layer ----------------------------------------
 
 	    Default scheduler for SQ..: mq-deadline ->   bfq
+	    Default scheduler for MQ..:        none ->   kyber
 
 config BROKEN
 	bool