Mesa (master): nvc0: fix setting of subpixel precision during conservative rasterization

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: 8f6cbb8c7d5f1b05ffef53de4076a0a187c2f332
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f6cbb8c7d5f1b05ffef53de4076a0a187c2f332

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Fri May 11 13:03:28 2018 +0100

nvc0: fix setting of subpixel precision during conservative rasterization

Fixes: 07dac3e040 ("nvc0: add conservative rasterization support")
Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/nouveau/nvc0/mme/com9097.mme   | 2 +-
 src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme
index ecf9960667..38c2e86843 100644
--- a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme
+++ b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme
@@ -569,7 +569,7 @@ qbw_done:
    mov $r2 0x831
    send (extrinsrt 0x0 $r2 0 12 11) /* sends 0x418800 */
    /* Subpixel precision */
-   mov $r2 (extrinsrt 0x0 $r1 0 3 0)
+   mov $r2 (extrinsrt 0x0 $r1 0 4 0)
    mov $r2 (extrinsrt $r2 $r1 4 4 8)
    maddr 0x8287 /* SUBPIXEL_PRECISION[0] (incrementing by 8 methods) */
    mov $r3 16 /* loop counter */
diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
index 3eacda9a27..49c0891114 100644
--- a/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
+++ b/src/gallium/drivers/nouveau/nvc0/mme/com9097.mme.h
@@ -384,7 +384,7 @@ uint32_t mme9097_conservative_raster_state[] = {
 	0x06310021,
 	0x020c4211,
 	0x5b008042,
-	0x00c04212,
+	0x01004212,
 	0x41085212,
 	0x20a1c021,
 	0x00040311,