diff --git a/.pick_status.json b/.pick_status.json index 842dd113b65..40c579c7a1a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2664,7 +2664,7 @@ "description": "panvk: remove unused flag", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e25064c026a333a27b203b8c1d1cf3dc7995b7b3", "notes": null diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index 028d3893bde..926327f9f90 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -94,7 +94,7 @@ panfrost-g52-vk:arm64: FDO_CI_CONCURRENT: 6 # We get OOMkills if we go too wide since VKCTS 1.4.4.0 MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 PAN_I_WANT_A_BROKEN_VULKAN_DRIVER: 1 - PANVK_DEBUG: "no_known_warn,sync,coherent_before_cached" + PANVK_DEBUG: "sync,coherent_before_cached" DEQP_SUITE: panfrost-g52-vk HWCI_START_WESTON: 1 @@ -179,7 +179,7 @@ panfrost-g610-vk:arm64: variables: DRIVER_NAME: panvk MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 - PANVK_DEBUG: "no_known_warn,sync,cs,coherent_before_cached" + PANVK_DEBUG: "sync,cs,coherent_before_cached" DEQP_SUITE: panfrost-g610-vk DEQP_FRACTION: 3 HWCI_START_WESTON: 1 @@ -197,7 +197,7 @@ panfrost-g610-vk-asan:arm64: DRIVER_NAME: panvk FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 - PANVK_DEBUG: "no_known_warn,sync,cs,coherent_before_cached" + PANVK_DEBUG: "sync,cs,coherent_before_cached" DEQP_SUITE: panfrost-g610-vk-asan LAVA_TAGS: at-least-8gb @@ -211,7 +211,7 @@ panfrost-g925-vk:arm64: variables: DRIVER_NAME: panvk MESA_VK_IGNORE_CONFORMANCE_WARNING: 1 - PANVK_DEBUG: "no_known_warn,sync,cs,coherent_before_cached" + PANVK_DEBUG: "sync,cs,coherent_before_cached" DEQP_SUITE: panfrost-g925-vk HWCI_START_WESTON: 1 diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c index e78765bd3ac..f8f6f04441c 100644 --- a/src/panfrost/vulkan/panvk_instance.c +++ b/src/panfrost/vulkan/panvk_instance.c @@ -39,7 +39,6 @@ static const struct debug_control panvk_debug_options[] = { {"noafbc", PANVK_DEBUG_NO_AFBC}, {"linear", PANVK_DEBUG_LINEAR}, {"dump", PANVK_DEBUG_DUMP}, - {"no_known_warn", PANVK_DEBUG_NO_KNOWN_WARN}, {"cs", PANVK_DEBUG_CS}, {"copy_gfx", PANVK_DEBUG_COPY_GFX}, {"force_simultaneous", PANVK_DEBUG_FORCE_SIMULTANEOUS}, diff --git a/src/panfrost/vulkan/panvk_instance.h b/src/panfrost/vulkan/panvk_instance.h index cf22ea78744..a576ff381d3 100644 --- a/src/panfrost/vulkan/panvk_instance.h +++ b/src/panfrost/vulkan/panvk_instance.h @@ -23,7 +23,6 @@ enum panvk_debug_flags { PANVK_DEBUG_NO_AFBC = 1 << 4, PANVK_DEBUG_LINEAR = 1 << 5, PANVK_DEBUG_DUMP = 1 << 6, - PANVK_DEBUG_NO_KNOWN_WARN = 1 << 7, PANVK_DEBUG_CS = 1 << 8, PANVK_DEBUG_COPY_GFX = 1 << 9, PANVK_DEBUG_FORCE_SIMULTANEOUS = 1 << 10,