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, 95 deletions

diff --git a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_screen.h b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_screen.h
deleted file mode 100644
index dc57a38db..000000000
--- a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_screen.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2012-2015 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:
- *    Wladimir J. van der Laan <laanwj@gmail.com>
- *    Christian Gmeiner <christian.gmeiner@gmail.com>
- */
-
-#ifndef H_ETNAVIV_SCREEN
-#define H_ETNAVIV_SCREEN
-
-#include "etnaviv_internal.h"
-
-#include "os/os_thread.h"
-#include "pipe/p_screen.h"
-#include "renderonly/renderonly.h"
-#include "util/slab.h"
-
-struct etna_bo;
-
-/* Enum with indices for each of the feature words */
-enum viv_features_word {
-   viv_chipFeatures = 0,
-   viv_chipMinorFeatures0 = 1,
-   viv_chipMinorFeatures1 = 2,
-   viv_chipMinorFeatures2 = 3,
-   viv_chipMinorFeatures3 = 4,
-   viv_chipMinorFeatures4 = 5,
-   viv_chipMinorFeatures5 = 6,
-   VIV_FEATURES_WORD_COUNT /* Must be last */
-};
-
-/** Convenience macro to probe features from state.xml.h:
- * VIV_FEATURE(chipFeatures, FAST_CLEAR)
- * VIV_FEATURE(chipMinorFeatures1, AUTO_DISABLE)
- */
-#define VIV_FEATURE(screen, word, feature) \
-   ((screen->features[viv_ ## word] & (word ## _ ## feature)) != 0)
-
-struct etna_screen {
-   struct pipe_screen base;
-
-   int refcnt;
-   void *winsys_priv;
-
-   struct etna_device *dev;
-   struct etna_gpu *gpu;
-   struct etna_pipe *pipe;
-   struct renderonly *ro;
-
-   struct slab_parent_pool transfer_pool;
-
-   uint32_t model;
-   uint32_t revision;
-   uint32_t features[VIV_FEATURES_WORD_COUNT];
-
-   struct etna_specs specs;
-
-   uint32_t drm_version;
-};
-
-static inline struct etna_screen *
-etna_screen(struct pipe_screen *pscreen)
-{
-   return (struct etna_screen *)pscreen;
-}
-
-struct etna_bo *
-etna_screen_bo_from_handle(struct pipe_screen *pscreen,
-                           struct winsys_handle *whandle, unsigned *out_stride);
-
-struct pipe_screen *
-etna_screen_create(struct etna_device *dev, struct etna_gpu *gpu,
-                   struct renderonly *ro);
-
-#endif