From 63cdad6bb7d66a70451d5b0af7b0b466422f14d6 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Wed, 20 Aug 2025 20:39:29 +0200 Subject: [PATCH] nouveau/headers: Add missing M2MF parsing and set it for subchan 2 Signed-off-by: Mary Guillemard Fixes: 4bb256e5ac3 ("nouveau: Handle subchannels better in nv_push_print()") Reviewed-by: Faith Ekstrand Part-of: --- src/nouveau/headers/nv_push.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/nouveau/headers/nv_push.c b/src/nouveau/headers/nv_push.c index 1e1207a7e65..e19a5968282 100644 --- a/src/nouveau/headers/nv_push.c +++ b/src/nouveau/headers/nv_push.c @@ -79,6 +79,7 @@ vk_push_print(FILE *fp, const struct nv_push *push, uint16_t curr_subchans[8] = {0}; curr_subchans[0] = devinfo->cls_eng3d; curr_subchans[1] = devinfo->cls_compute; + curr_subchans[2] = devinfo->cls_m2mf; curr_subchans[3] = 0x2d; curr_subchans[4] = devinfo->cls_copy; @@ -276,6 +277,15 @@ vk_push_print(FILE *fp, const struct nv_push *push, else P_DUMP_NVA0C0_MTHD_DATA(fp, mthd, value, "\t\t"); break; + case 0x39: + case 0x40: + if (cls_hi >= 0xa1) + P_DUMP_NVA140_MTHD_DATA(fp, mthd, value, "\t\t"); + else if (cls_hi >= 0xa0) + P_DUMP_NVA040_MTHD_DATA(fp, mthd, value, "\t\t"); + else if (cls_hi >= 0x90) + P_DUMP_NV9039_MTHD_DATA(fp, mthd, value, "\t\t"); + break; case 0x2d: P_DUMP_NV902D_MTHD_DATA(fp, mthd, value, "\t\t"); break;