Merge Mesa 20.0.8

With Mesa 20.1 even after the kernel change to do wbinvd on all cpus
sthen@ reported that hard hangs still occurred on his Haswell system
with inteldrm.

Mark Kane also reported seeing hangs on Ivy Bridge on bugs@.

Some systems/workloads seem to be more prone to triggering this than
others as I have not seen any hangs on Ivy Bridge and the only hangs
I saw on Haswell when running piglit went away with the wbinvd change.

It seems something is wrong with drm memory attributes or coherency in
the kernel and newer Mesa versions expect behaviour we don't have.

1 files changed, 11 insertions, 36 deletions

diff --git a/lib/mesa/src/gallium/include/pipe/p_defines.h b/lib/mesa/src/gallium/include/pipe/p_defines.h
index 9ab7fe63d..4a7edd4e0 100644
--- a/lib/mesa/src/gallium/include/pipe/p_defines.h
+++ b/lib/mesa/src/gallium/include/pipe/p_defines.h
@@ -346,13 +346,6 @@ enum pipe_transfer_usage
    PIPE_TRANSFER_COHERENT = (1 << 14),
 
    /**
-    * Map a resource in a thread-safe manner, because the calling thread can
-    * be any thread. It can only be used if both WRITE and UNSYNCHRONIZED are
-    * set.
-    */
-   PIPE_TRANSFER_THREAD_SAFE = 1 << 15,
-
-   /**
     * This and higher bits are reserved for private use by drivers. Drivers
     * should use this as (PIPE_TRANSFER_DRV_PRV << i).
     */
@@ -633,20 +626,6 @@ enum pipe_swizzle {
    PIPE_SWIZZLE_MAX, /**< Number of enums counter (must be last) */
 };
 
-/**
- * Viewport swizzles
- */
-enum pipe_viewport_swizzle {
-   PIPE_VIEWPORT_SWIZZLE_POSITIVE_X,
-   PIPE_VIEWPORT_SWIZZLE_NEGATIVE_X,
-   PIPE_VIEWPORT_SWIZZLE_POSITIVE_Y,
-   PIPE_VIEWPORT_SWIZZLE_NEGATIVE_Y,
-   PIPE_VIEWPORT_SWIZZLE_POSITIVE_Z,
-   PIPE_VIEWPORT_SWIZZLE_NEGATIVE_Z,
-   PIPE_VIEWPORT_SWIZZLE_POSITIVE_W,
-   PIPE_VIEWPORT_SWIZZLE_NEGATIVE_W,
-};
-
 #define PIPE_TIMEOUT_INFINITE 0xffffffffffffffffull
 
 
@@ -817,7 +796,6 @@ enum pipe_cap
    PIPE_CAP_SHAREABLE_SHADERS,
    PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS,
    PIPE_CAP_CLEAR_TEXTURE,
-   PIPE_CAP_CLEAR_SCISSORED,
    PIPE_CAP_DRAW_PARAMETERS,
    PIPE_CAP_TGSI_PACK_HALF_FLOAT,
    PIPE_CAP_MULTI_DRAW_INDIRECT,
@@ -934,20 +912,6 @@ enum pipe_cap
    PIPE_CAP_MAX_VERTEX_BUFFERS,
    PIPE_CAP_OPENCL_INTEGER_FUNCTIONS,
    PIPE_CAP_INTEGER_MULTIPLY_32X16,
-   /* Turn draw, dispatch, blit into NOOP */
-   PIPE_CAP_FRONTEND_NOOP,
-   PIPE_CAP_NIR_IMAGES_AS_DEREF,
-   PIPE_CAP_PACKED_STREAM_OUTPUT,
-   PIPE_CAP_VIEWPORT_TRANSFORM_LOWERED,
-   PIPE_CAP_PSIZ_CLAMPED,
-   PIPE_CAP_DRAW_INFO_START_WITH_USER_INDICES,
-   PIPE_CAP_GL_BEGIN_END_BUFFER_SIZE,
-   PIPE_CAP_VIEWPORT_SWIZZLE,
-   PIPE_CAP_SYSTEM_SVM,
-   PIPE_CAP_VIEWPORT_MASK,
-   PIPE_CAP_ALPHA_TO_COVERAGE_DITHER_CONTROL,
-   PIPE_CAP_MAP_UNSYNCHRONIZED_THREAD_SAFE,
-   PIPE_CAP_NO_CLIP_ON_COPY_TEX,
 };
 
 /**
@@ -1274,6 +1238,17 @@ enum pipe_fd_type
    PIPE_FD_TYPE_SYNCOBJ,
 };
 
+enum pipe_debug_type
+{
+   PIPE_DEBUG_TYPE_OUT_OF_MEMORY = 1,
+   PIPE_DEBUG_TYPE_ERROR,
+   PIPE_DEBUG_TYPE_SHADER_INFO,
+   PIPE_DEBUG_TYPE_PERF_INFO,
+   PIPE_DEBUG_TYPE_INFO,
+   PIPE_DEBUG_TYPE_FALLBACK,
+   PIPE_DEBUG_TYPE_CONFORMANCE,
+};
+
 /**
  * counter type and counter data type enums used by INTEL_performance_query
  * APIs in gallium drivers.