From 5a81631fa2bb99714c60b27b6eec47538840a6b9 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Sun, 17 Feb 2013 11:31:17 +1000 Subject: [PATCH] --- yaml --- r: 358298 b: refs/heads/master c: f63740fd580e0645c5123897891b72ec25b396ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20c0c87721b8..833eff72f4e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89e728ce07630a5584875b8a811a8bd02844b1d3 +refs/heads/master: f63740fd580e0645c5123897891b72ec25b396ef diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c b/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c index d51f29dc38b7..f2b1a7a124f2 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c +++ b/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c @@ -909,9 +909,8 @@ nv50_graph_init(struct nouveau_object *object) nv_wr32(priv, 0x400828, 0x00000000); nv_wr32(priv, 0x40082c, 0x00000000); nv_wr32(priv, 0x400830, 0x00000000); - nv_wr32(priv, 0x400724, 0x00000000); nv_wr32(priv, 0x40032c, 0x00000000); - nv_wr32(priv, 0x400320, 4); /* CTXCTL_CMD = NEWCTXDMA */ + nv_wr32(priv, 0x400330, 0x00000000); /* some unknown zcull magic */ switch (nv_device(priv)->chipset & 0xf0) {