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, 10 insertions, 21 deletions

diff --git a/lib/mesa/src/util/mesa-sha1.h b/lib/mesa/src/util/mesa-sha1.h
index bde50ba1e..0be5485f3 100644
--- a/lib/mesa/src/util/mesa-sha1.h
+++ b/lib/mesa/src/util/mesa-sha1.h
@@ -20,38 +20,27 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef MESA_SHA1_H
-#define MESA_SHA1_H
+#ifndef SHA1_H
+#define SHA1_H
 
 #include <stdlib.h>
-#include "c99_compat.h"
-#include "sha1/sha1.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define mesa_sha1 _SHA1_CTX
+struct mesa_sha1;
 
-static inline void
-_mesa_sha1_init(struct mesa_sha1 *ctx)
-{
-   SHA1Init(ctx);
-}
+struct mesa_sha1 *
+_mesa_sha1_init(void);
 
-static inline void
-_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, size_t size)
-{
-   SHA1Update(ctx, (const unsigned char *)data, size);
-}
+int
+_mesa_sha1_update(struct mesa_sha1 *ctx, const void *data, int size);
 
-static inline void
-_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
-{
-   SHA1Final(result, ctx);
-}
+int
+_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20]);
 
-void
+char *
 _mesa_sha1_format(char *buf, const unsigned char *sha1);
 
 void