From e762fe00cd335e864ad362f31b30c2e9612f3f2f Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 17 May 2021 11:33:26 -0700 Subject: [PATCH] i915g: Disable 3D-pipeline clears. The 3D-pipeline fast clears try to emit FS constants before an FS is necessarily bound, causing segfaults in dEQP. Plus it flushes the whole batchbuffer so it'll probably be slower anyway. Fixes: 6358e6371b31 ("i915g: implement hw clear") Reviewed-by: Adam Jackson Part-of: (cherry picked from commit 8509aceb7449c6ae0bbc3d35c13a05b62fd48bc1) --- .pick_status.json | 2 +- src/gallium/drivers/i915/i915_debug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9d29a55c3d7..9dafd6ecde0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1165,7 +1165,7 @@ "description": "i915g: Disable 3D-pipeline clears.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6358e6371b31671acbfa7c00336673f62ee928c5" }, diff --git a/src/gallium/drivers/i915/i915_debug.c b/src/gallium/drivers/i915/i915_debug.c index dbf81f76d85..395f76a49de 100644 --- a/src/gallium/drivers/i915/i915_debug.c +++ b/src/gallium/drivers/i915/i915_debug.c @@ -50,7 +50,7 @@ unsigned i915_debug = 0; DEBUG_GET_ONCE_FLAGS_OPTION(i915_debug, "I915_DEBUG", i915_debug_options, 0) DEBUG_GET_ONCE_BOOL_OPTION(i915_no_tiling, "I915_NO_TILING", FALSE) DEBUG_GET_ONCE_BOOL_OPTION(i915_lie, "I915_LIE", TRUE) -DEBUG_GET_ONCE_BOOL_OPTION(i915_use_blitter, "I915_USE_BLITTER", FALSE) +DEBUG_GET_ONCE_BOOL_OPTION(i915_use_blitter, "I915_USE_BLITTER", TRUE) void i915_debug_init(struct i915_screen *is) {