From f0325ca3da7217064a50d297bd362dcee832e904 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 27 Sep 2021 19:47:22 -0400 Subject: [PATCH] panfrost: Fix PAN_MESA_DEBUG=sync with INTEL_blackhole_render We need to ignore the "sync" in this case, or we'll crash with "incomplete job" since we never submitted the work. Fixes the Piglit intel_blackhole-draw_gles2 when run in CI. Signed-off-by: Alyssa Rosenzweig Cc: mesa-stable Part-of: --- src/gallium/drivers/panfrost/pan_job.c | 3 ++- src/panfrost/ci/piglit-panfrost-g52-fails.txt | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index ec876033496..ebf42cbfc82 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -645,7 +645,8 @@ panfrost_batch_submit_ioctl(struct panfrost_batch *batch, if (dev->debug & PAN_DBG_TRACE) pandecode_jc(submit.jc, dev->gpu_id); - if (dev->debug & PAN_DBG_SYNC) + /* Jobs won't be complete if blackhole rendering, that's ok */ + if (!ctx->is_noop && dev->debug & PAN_DBG_SYNC) pandecode_abort_on_fault(submit.jc, dev->gpu_id); } diff --git a/src/panfrost/ci/piglit-panfrost-g52-fails.txt b/src/panfrost/ci/piglit-panfrost-g52-fails.txt index 4cd624949a8..6e2e62f82ac 100644 --- a/src/panfrost/ci/piglit-panfrost-g52-fails.txt +++ b/src/panfrost/ci/piglit-panfrost-g52-fails.txt @@ -829,8 +829,6 @@ spec@glsl-1.30@execution@tex-miplevel-selection textureprojoffset 2drect,Crash spec@glsl-1.30@execution@tex-miplevel-selection textureprojoffset 2drect_projvec4,Crash spec@glsl-1.30@execution@tex-miplevel-selection textureprojoffset 2drectshadow,Crash spec@glsl-es-3.00@execution@varying-struct-centroid_gles3,Fail -spec@intel_blackhole_render@intel_blackhole-draw_gles2,Crash -spec@intel_blackhole_render@intel_blackhole-draw_gles3,Crash spec@intel_performance_query@intel_performance_query-issue_2235,Fail spec@khr_texture_compression_astc@miptree-gles hdr,Fail spec@khr_texture_compression_astc@miptree-gles hdr@HDR Profile,Fail