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, 54 insertions, 38 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/vl/vl_csc.c b/lib/mesa/src/gallium/auxiliary/vl/vl_csc.c
index e4395d062..c8efe2867 100644
--- a/lib/mesa/src/gallium/auxiliary/vl/vl_csc.c
+++ b/lib/mesa/src/gallium/auxiliary/vl/vl_csc.c
@@ -59,10 +59,10 @@
  * [ 0, 0, 0, 1]
  *
  * brightness
- * [ 1, 0, 0, b/c]
- * [ 0, 1, 0,   0]
- * [ 0, 0, 1,   0]
- * [ 0, 0, 0,   1]
+ * [ 1, 0, 0, b]
+ * [ 0, 1, 0, 0]
+ * [ 0, 0, 1, 0]
+ * [ 0, 0, 0, 1]
  *
  * saturation
  * [ 1, 0, 0, 0]
@@ -108,6 +108,18 @@ static const vl_csc_matrix bt_601 =
 };
 
 /*
+ * Converts ITU-R BT.601 YCbCr pixels to RGB pixels where:
+ * Y is in [16,235], Cb and Cr are in [16,240]
+ * R, G, and B are in [0,255]
+ */
+static const vl_csc_matrix bt_601_full =
+{
+   { 1.164f,  0.0f,    1.596f, 0.0f, },
+   { 1.164f, -0.391f, -0.813f, 0.0f, },
+   { 1.164f,  2.018f,  0.0f,   0.0f, }
+};
+
+/*
  * Converts ITU-R BT.709 YCbCr pixels to RGB pixels where:
  * Y is in [16,235], Cb and Cr are in [16,240]
  * R, G, and B are in [16,235]
@@ -120,15 +132,29 @@ static const vl_csc_matrix bt_709 =
 };
 
 /*
- * Converts SMPTE 240M YCbCr pixels to RGB pixels where:
+ * Converts ITU-R BT.709 YCbCr pixels to RGB pixels where:
  * Y is in [16,235], Cb and Cr are in [16,240]
- * R, G, and B are in [16,235]
+ * R, G, and B are in [0,255]
  */
+static const vl_csc_matrix bt_709_full =
+{
+   { 1.164f,  0.0f,    1.793f, 0.0f, },
+   { 1.164f, -0.213f, -0.534f, 0.0f, },
+   { 1.164f,  2.115f,  0.0f,   0.0f, }
+};
+
 static const vl_csc_matrix smpte240m =
 {
-   { 1.0f,  0.0f,    1.541f, 0.0f, },
-   { 1.0f, -0.221f, -0.466f, 0.0f, },
-   { 1.0f,  1.785f,  0.0f,   0.0f, }
+   { 1.0f,  0.0f,    1.582f, 0.0f, },
+   { 1.0f, -0.228f, -0.478f, 0.0f, },
+   { 1.0f,  1.833f,  0.0f,   0.0f, }
+};
+
+static const vl_csc_matrix smpte240m_full =
+{
+   { 1.164f,  0.0f,    1.794f, 0.0f, },
+   { 1.164f, -0.258f, -0.543f, 0.0f, },
+   { 1.164f,  2.079f,  0.0f,   0.0f, }
 };
 
 static const vl_csc_matrix identity =
@@ -150,6 +176,7 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
                        bool full_range,
                        vl_csc_matrix *matrix)
 {
+   float ybias = full_range ? -16.0f/255.0f : 0.0f;
    float cbbias = -128.0f/255.0f;
    float crbias = -128.0f/255.0f;
 
@@ -158,31 +185,20 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
    float s = p->saturation;
    float b = p->brightness;
    float h = p->hue;
-   float x, y;
 
    const vl_csc_matrix *cstd;
 
-   if (full_range) {
-      c *= 1.164f;              /* Adjust for the y range */
-      b *= 1.164f;              /* Adjust for the y range */
-      b -= c * 16.0f  / 255.0f; /* Adjust for the y bias */
-   }
-
-   /* Parameter substitutions */
-   x = c * s * cosf(h);
-   y = c * s * sinf(h);
-
    assert(matrix);
 
    switch (cs) {
       case VL_CSC_COLOR_STANDARD_BT_601:
-         cstd = &bt_601;
+         cstd = full_range ? &bt_601_full : &bt_601;
          break;
       case VL_CSC_COLOR_STANDARD_BT_709:
-         cstd = &bt_709;
+         cstd = full_range ? &bt_709_full : &bt_709;
          break;
       case VL_CSC_COLOR_STANDARD_SMPTE_240M:
-         cstd = &smpte240m;
+         cstd = full_range ? &smpte240m_full : &smpte240m;
          break;
       case VL_CSC_COLOR_STANDARD_IDENTITY:
       default:
@@ -192,23 +208,23 @@ void vl_csc_get_matrix(enum VL_CSC_COLOR_STANDARD cs,
    }
 
    (*matrix)[0][0] = c * (*cstd)[0][0];
-   (*matrix)[0][1] = (*cstd)[0][1] * x - (*cstd)[0][2] * y;
-   (*matrix)[0][2] = (*cstd)[0][2] * x + (*cstd)[0][1] * y;
-   (*matrix)[0][3] = (*cstd)[0][3] + (*cstd)[0][0] * b +
-                     (*cstd)[0][1] * (x * cbbias + y * crbias) +
-                     (*cstd)[0][2] * (x * crbias - y * cbbias);
+   (*matrix)[0][1] = c * (*cstd)[0][1] * s * cosf(h) - c * (*cstd)[0][2] * s * sinf(h);
+   (*matrix)[0][2] = c * (*cstd)[0][2] * s * cosf(h) + c * (*cstd)[0][1] * s * sinf(h);
+   (*matrix)[0][3] = (*cstd)[0][3] + (*cstd)[0][0] * (b + c * ybias) +
+                     (*cstd)[0][1] * (c * cbbias * s * cosf(h) + c * crbias * s * sinf(h)) +
+                     (*cstd)[0][2] * (c * crbias * s * cosf(h) - c * cbbias * s * sinf(h));
 
    (*matrix)[1][0] = c * (*cstd)[1][0];
-   (*matrix)[1][1] = (*cstd)[1][1] * x - (*cstd)[1][2] * y;
-   (*matrix)[1][2] = (*cstd)[1][2] * x + (*cstd)[1][1] * y;
-   (*matrix)[1][3] = (*cstd)[1][3] + (*cstd)[1][0] * b +
-                     (*cstd)[1][1] * (x * cbbias + y * crbias) +
-                     (*cstd)[1][2] * (x * crbias - y * cbbias);
+   (*matrix)[1][1] = c * (*cstd)[1][1] * s * cosf(h) - c * (*cstd)[1][2] * s * sinf(h);
+   (*matrix)[1][2] = c * (*cstd)[1][2] * s * cosf(h) + c * (*cstd)[1][1] * s * sinf(h);
+   (*matrix)[1][3] = (*cstd)[1][3] + (*cstd)[1][0] * (b + c * ybias) +
+                     (*cstd)[1][1] * (c * cbbias * s * cosf(h) + c * crbias * s * sinf(h)) +
+                     (*cstd)[1][2] * (c * crbias * s * cosf(h) - c * cbbias * s * sinf(h));
 
    (*matrix)[2][0] = c * (*cstd)[2][0];
-   (*matrix)[2][1] = (*cstd)[2][1] * x - (*cstd)[2][2] * y;
-   (*matrix)[2][2] = (*cstd)[2][2] * x + (*cstd)[2][1] * y;
-   (*matrix)[2][3] = (*cstd)[2][3] + (*cstd)[2][0] * b +
-                     (*cstd)[2][1] * (x * cbbias + y * crbias) +
-                     (*cstd)[2][2] * (x * crbias - y * cbbias);
+   (*matrix)[2][1] = c * (*cstd)[2][1] * s * cosf(h) - c * (*cstd)[2][2] * s * sinf(h);
+   (*matrix)[2][2] = c * (*cstd)[2][2] * s * cosf(h) + c * (*cstd)[2][1] * s * sinf(h);
+   (*matrix)[2][3] = (*cstd)[2][3] + (*cstd)[2][0] * (b + c * ybias) +
+                     (*cstd)[2][1] * (c * cbbias * s * cosf(h) + c * crbias * s * sinf(h)) +
+                     (*cstd)[2][2] * (c * crbias * s * cosf(h) - c * cbbias * s * sinf(h));
 }