From ae72673cd7746249806d9d991ead5f0d332a9a13 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 5 Sep 2012 12:19:26 +1000 Subject: [PATCH] --- yaml --- r: 329668 b: refs/heads/master c: cd8c14b407d59ac4b8d324f5f9cdf223a2079c88 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8065fcc9981e..59a57ba624bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5bf578ce61aecd4612d16e60235c11ed5f92c0e +refs/heads/master: cd8c14b407d59ac4b8d324f5f9cdf223a2079c88 diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c index 7c2840cc2bbf..078a2b9d6bd6 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c @@ -26,6 +26,7 @@ struct nvc0_ltcg_priv { struct nouveau_ltcg base; + u32 subp_nr; }; static void @@ -49,7 +50,7 @@ nvc0_ltcg_intr(struct nouveau_subdev *subdev) units = nv_rd32(priv, 0x00017c); while (units) { u32 subp, unit = ffs(units) - 1; - for (subp = 0; subp < 2; subp++) + for (subp = 0; subp < priv->subp_nr; subp++) nvc0_ltcg_subp_isr(priv, unit, subp); units &= ~(1 << unit); } @@ -73,6 +74,7 @@ nvc0_ltcg_ctor(struct nouveau_object *parent, struct nouveau_object *engine, if (ret) return ret; + priv->subp_nr = nv_rd32(priv, 0x17e8dc) >> 24; nv_mask(priv, 0x17e820, 0x00100000, 0x00000000); /* INTR_EN &= ~0x10 */ nv_subdev(priv)->intr = nvc0_ltcg_intr;