ci/freedreno: timestamp-get no longer fails on Adreno

Fixes: 659e557676d2 ("freedreno: Fix timestamp conversion")
Cc: mesa-stable #23.3
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26611>
(cherry picked from commit 5527c090f41ab665efe1a89936f7306d201a1faa)

diff --git a/.pick_status.json b/.pick_status.json
index 13923ee..e43c654 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -844,7 +844,7 @@
         "description": "ci/freedreno: timestamp-get no longer fails on Adreno",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "659e557676d2ccd5c765b95f2d887ffa17349031",
         "notes": null

diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt
index a009feb..3e130a1 100644 (file)
--- a/src/freedreno/ci/freedreno-a530-fails.txt
+++ b/src/freedreno/ci/freedreno-a530-fails.txt
@@ -208,7 +208,6 @@ spec@arb_separate_shader_objects@400 combinations by location,Fail
 spec@arb_separate_shader_objects@400 combinations by name,Fail
 spec@arb_texture_rectangle@1-1-linear-texture,Fail
 spec@arb_timer_query@query gl_timestamp,Fail
-spec@arb_timer_query@timestamp-get,Fail
 spec@arb_transform_feedback3@gl_skipcomponents1-1,Fail
 spec@arb_transform_feedback3@gl_skipcomponents1-2,Fail
 spec@arb_transform_feedback3@gl_skipcomponents1-3,Fail

diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 71e60f9..c537152 100644 (file)
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -110,8 +110,6 @@ spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-dvec4-i
 
 spec@arb_texture_rectangle@1-1-linear-texture,Fail
 
-spec@arb_timer_query@timestamp-get,Fail
-
 spec@arb_vertex_type_2_10_10_10_rev@attrib-p-type-size-match,Fail
 
 # fails unrelated to GL_ARB_enhanced_layouts