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, 16 insertions, 5 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/util/u_draw.h b/lib/mesa/src/gallium/auxiliary/util/u_draw.h
index 5c0880f6c..b16f10646 100644
--- a/lib/mesa/src/gallium/auxiliary/util/u_draw.h
+++ b/lib/mesa/src/gallium/auxiliary/util/u_draw.h
@@ -49,7 +49,10 @@ util_draw_init_info(struct pipe_draw_info *info)
 
 
 static inline void
-util_draw_arrays(struct pipe_context *pipe, uint mode, uint start, uint count)
+util_draw_arrays(struct pipe_context *pipe,
+                 enum pipe_prim_type mode,
+                 uint start,
+                 uint count)
 {
    struct pipe_draw_info info;
 
@@ -65,7 +68,9 @@ util_draw_arrays(struct pipe_context *pipe, uint mode, uint start, uint count)
 
 static inline void
 util_draw_elements(struct pipe_context *pipe, int index_bias,
-                   uint mode, uint start, uint count)
+                   enum pipe_prim_type mode,
+                   uint start,
+                   uint count)
 {
    struct pipe_draw_info info;
 
@@ -81,7 +86,9 @@ util_draw_elements(struct pipe_context *pipe, int index_bias,
 
 static inline void
 util_draw_arrays_instanced(struct pipe_context *pipe,
-                           uint mode, uint start, uint count,
+                           enum pipe_prim_type mode,
+                           uint start,
+                           uint count,
                            uint start_instance,
                            uint instance_count)
 {
@@ -102,7 +109,9 @@ util_draw_arrays_instanced(struct pipe_context *pipe,
 static inline void
 util_draw_elements_instanced(struct pipe_context *pipe,
                              int index_bias,
-                             uint mode, uint start, uint count,
+                             enum pipe_prim_type mode,
+                             uint start,
+                             uint count,
                              uint start_instance,
                              uint instance_count)
 {
@@ -125,7 +134,9 @@ util_draw_range_elements(struct pipe_context *pipe,
                          int index_bias,
                          uint min_index,
                          uint max_index,
-                         uint mode, uint start, uint count)
+                         enum pipe_prim_type mode,
+                         uint start,
+                         uint count)
 {
    struct pipe_draw_info info;