From 3359b8d4148feb30121f192de5d50e4d1187393e Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sat, 8 Nov 2025 14:24:01 +0100 Subject: [PATCH] rusticl/queue: fix error code for invalid queue properties part 2 Fixes: 2c202eb7870 ("rusticl: verify validity of property names and values") Part-of: (cherry picked from commit e98abe35c020b2e42e557d690df1a2c25bd1b7b0) --- .pick_status.json | 2 +- src/gallium/frontends/rusticl/api/queue.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 67142eba974..f78dae45a0e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -714,7 +714,7 @@ "description": "rusticl/queue: fix error code for invalid queue properties part 2", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2c202eb7870524072863823e1a9413222021317f", "notes": null diff --git a/src/gallium/frontends/rusticl/api/queue.rs b/src/gallium/frontends/rusticl/api/queue.rs index 3862b354600..1835550829f 100644 --- a/src/gallium/frontends/rusticl/api/queue.rs +++ b/src/gallium/frontends/rusticl/api/queue.rs @@ -134,7 +134,7 @@ fn create_command_queue_with_properties( // SAFETY: properties is a 0 terminated array by spec. let properties = unsafe { Properties::new(properties) }.ok_or(CL_INVALID_VALUE)?; for (&key, &val) in properties.iter() { - match u32::try_from(key).or(Err(CL_INVALID_PROPERTY))? { + match u32::try_from(key).or(Err(CL_INVALID_VALUE))? { CL_QUEUE_PROPERTIES => queue_properties = val, CL_QUEUE_PRIORITY_KHR if d.context_priority_supported() != 0 => { let valid_props: cl_queue_properties = (CL_QUEUE_PRIORITY_LOW_KHR