From 9b51c8e656d250825f1f9c16207d4810f53c57d7 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 20 Mar 2013 11:34:32 +1000 Subject: [PATCH] --- yaml --- r: 371575 b: refs/heads/master c: 7092a8dd5c16c32746444bcd468b429185c25472 h: refs/heads/master i: 371573: 9dff58add26e28b790810128befad1f830b02a38 371571: 3ca78ce4cdd4d17ab136e8b9504aafe4ea9314d7 371567: cdefab566ab8747b8eaf260cc97dc9717f8d12b7 v: v3 --- [refs] | 2 +- .../gpu/drm/nouveau/core/engine/graph/ctxnve0.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8f7289fa4f32..3be08660acf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba366c25bc0b2a6f5e4d3fab07851e6f39b883be +refs/heads/master: 7092a8dd5c16c32746444bcd468b429185c25472 diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c b/trunk/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c index 6d8c63931ee6..ae27dae3fe38 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c +++ b/trunk/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c @@ -2772,10 +2772,15 @@ nve0_grctx_generate(struct nvc0_graph_priv *priv) for (i = 0; i < 8; i++) nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); - nv_wr32(priv, 0x405b00, 0x201); - nv_wr32(priv, 0x408850, 0x2); - nv_wr32(priv, 0x408958, 0x2); - nv_wr32(priv, 0x419f78, 0xa); + nv_wr32(priv, 0x405b00, (priv->tpc_total << 8) | priv->gpc_nr); + if (priv->gpc_nr == 1) { + nv_mask(priv, 0x408850, 0x0000000f, priv->tpc_nr[0]); + nv_mask(priv, 0x408958, 0x0000000f, priv->tpc_nr[0]); + } else { + nv_mask(priv, 0x408850, 0x0000000f, priv->gpc_nr); + nv_mask(priv, 0x408958, 0x0000000f, priv->gpc_nr); + } + nv_mask(priv, 0x419f78, 0x00000001, 0x00000000); nve0_grctx_generate_icmd(priv); nve0_grctx_generate_a097(priv);