Mesa (master): nv50: enable shader watchdog timer

[Christoph Bumiller]

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

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Mon Apr 23 20:08:54 2012 +0200

nv50: enable shader watchdog timer

---

 src/gallium/drivers/nv50/nv50_screen.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index a62c4b1..6de2319 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -351,6 +351,11 @@ nv50_screen_init_hwctx(struct nv50_screen *screen, unsigned tls_space)
    BEGIN_NV04(push, NV50_3D(UNK1400_LANES), 1);
    PUSH_DATA (push, 0xf);
 
+   if (debug_get_bool_option("NOUVEAU_SHADER_WATCHDOG", TRUE)) {
+      BEGIN_NV04(push, NV50_3D(WATCHDOG_TIMER), 1);
+      PUSH_DATA (push, 0x18);
+   }
+
    BEGIN_NV04(push, NV50_3D(RT_CONTROL), 1);
    PUSH_DATA (push, 1);