Revert to Mesa 13.0.6 again.

Corruption has again been reported on Intel hardware running Xorg with
the modesetting driver (which uses OpenGL based acceleration instead of
SNA acceleration the intel driver defaults to).

Reported in various forms on Sandy Bridge (X220), Ivy Bridge (X230) and
Haswell (X240).  Confirmed to not occur with the intel driver but the
xserver was changed to default to the modesetting driver on >= gen4
hardware (except Ironlake).

One means of triggering this is to open a large pdf with xpdf on an
idle machine and highlight a section of the document.

There have been reports of gpu hangs on gen4 intel hardware
(T500 with GM45, X61 with 965GM) when starting Xorg as well.

1 files changed, 0 insertions, 118 deletions

diff --git a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_uniforms.c b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_uniforms.c
deleted file mode 100644
index a8d970d18..000000000
--- a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_uniforms.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2016 Etnaviv Project
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Christian Gmeiner <christian.gmeiner@gmail.com>
- */
-
-#include "etnaviv_uniforms.h"
-
-#include "etnaviv_compiler.h"
-#include "etnaviv_context.h"
-#include "etnaviv_util.h"
-#include "pipe/p_defines.h"
-#include "util/u_math.h"
-
-static unsigned
-get_const_idx(const struct etna_context *ctx, bool frag, unsigned samp_id)
-{
-   if (frag)
-      return samp_id;
-
-   return samp_id + ctx->specs.vertex_sampler_offset;
-}
-
-static uint32_t
-get_texrect_scale(const struct etna_context *ctx, bool frag,
-                  enum etna_immediate_contents contents, uint32_t data)
-{
-   unsigned index = get_const_idx(ctx, frag, data);
-   struct pipe_sampler_view *texture = ctx->sampler_view[index];
-   uint32_t dim;
-
-   if (contents == ETNA_IMMEDIATE_TEXRECT_SCALE_X)
-      dim = texture->texture->width0;
-   else
-      dim = texture->texture->height0;
-
-   return fui(1.0f / dim);
-}
-
-void
-etna_uniforms_write(const struct etna_context *ctx,
-                    const struct etna_shader_variant *sobj,
-                    struct pipe_constant_buffer *cb, uint32_t *uniforms,
-                    unsigned *size)
-{
-   const struct etna_shader_uniform_info *uinfo = &sobj->uniforms;
-   bool frag = false;
-
-   if (cb->user_buffer) {
-      unsigned size = MIN2(cb->buffer_size, uinfo->const_count * 4);
-
-      memcpy(uniforms, cb->user_buffer, size);
-   }
-
-   if (sobj == ctx->shader.fs)
-      frag = true;
-
-   for (uint32_t i = 0; i < uinfo->imm_count; i++) {
-      switch (uinfo->imm_contents[i]) {
-      case ETNA_IMMEDIATE_CONSTANT:
-         uniforms[i + uinfo->const_count] = uinfo->imm_data[i];
-         break;
-
-      case ETNA_IMMEDIATE_TEXRECT_SCALE_X:
-      case ETNA_IMMEDIATE_TEXRECT_SCALE_Y:
-         uniforms[i + uinfo->const_count] =
-               get_texrect_scale(ctx, frag, uinfo->imm_contents[i], uinfo->imm_data[i]);
-         break;
-
-      case ETNA_IMMEDIATE_UNUSED:
-         /* nothing to do */
-         break;
-      }
-   }
-
-   *size = uinfo->const_count + uinfo->imm_count;
-}
-
-void
-etna_set_shader_uniforms_dirty_flags(struct etna_shader_variant *sobj)
-{
-   uint32_t dirty = 0;
-
-   for (uint32_t i = 0; i < sobj->uniforms.imm_count; i++) {
-      switch (sobj->uniforms.imm_contents[i]) {
-      case ETNA_IMMEDIATE_UNUSED:
-      case ETNA_IMMEDIATE_CONSTANT:
-         break;
-
-      case ETNA_IMMEDIATE_TEXRECT_SCALE_X:
-      case ETNA_IMMEDIATE_TEXRECT_SCALE_Y:
-         dirty |= ETNA_DIRTY_SAMPLER_VIEWS;
-         break;
-      }
-   }
-
-   sobj->uniforms_dirty_bits = dirty;
-}