From 4a90af4a3b263a7db83e79037070108467d50933 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Tue, 10 Mar 2026 08:55:23 +0100 Subject: [PATCH] nvk/mme: Add missing nullcheck in nvk_mme_test_state_state Needed for some FSR macro changes I want to test. Signed-off-by: Mary Guillemard Fixes: 7d6cc15ab81 ("nvk/mme: Add a unit test framework for driver macros") Reviewed-by: Karol Herbst Reviewed-by: Faith Ekstrand (cherry picked from commit 32895657b46781949fdc77010eb9e176d27ade3e) Part-of: --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_mme.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 76feee1bce7..d2bfe7c2187 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -814,7 +814,7 @@ "description": "nvk/mme: Add missing nullcheck in nvk_mme_test_state_state", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7d6cc15ab81178be7660a27b26626734773c267f", "notes": null diff --git a/src/nouveau/vulkan/nvk_mme.c b/src/nouveau/vulkan/nvk_mme.c index bbec8760987..7ed6c708516 100644 --- a/src/nouveau/vulkan/nvk_mme.c +++ b/src/nouveau/vulkan/nvk_mme.c @@ -79,9 +79,11 @@ nvk_mme_test_state_state(void *_ts, uint16_t addr) /* First, look backwards through the expected data that we've already * written. This ensures that mthd() impacts state(). */ - for (int32_t i = ts->ei - 1; i >= 0; i--) { - if (ts->test->expected[i].mthd == addr) - return ts->test->expected[i].data; + if (ts->test->expected != NULL) { + for (int32_t i = ts->ei - 1; i >= 0; i--) { + if (ts->test->expected[i].mthd == addr) + return ts->test->expected[i].data; + } } /* Now look at init. We assume the init data is unique */