projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e432d48
)
drm/nvc0/gr: remove max tpc count info
author
Ben Skeggs
<bskeggs@redhat.com>
Mon, 11 Jul 2011 05:54:20 +0000
(15:54 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 20 Sep 2011 06:08:08 +0000
(16:08 +1000)
Just assume a max of 16 everywhere, and hope it's okay.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvc0_grctx.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvc0_grctx.c
b/drivers/gpu/drm/nouveau/nvc0_grctx.c
index 0c9737a49149122f51d0dffee283e51cee9f8585..dd0e6a736b3b9254933e2d58b51c0502bf353aa8 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvc0_grctx.c
+++ b/
drivers/gpu/drm/nouveau/nvc0_grctx.c
@@
-1786,11
+1786,7
@@
nvc0_grctx_generate(struct nouveau_channel *chan)
nv_wr32(dev, 0x40587c, 0x00000000);
if (1) {
- const u8 chipset_tp_max[] = { 16, 4, 0, 4, 8, 0, 0, 0,
- 16, 0, 0, 0, 0, 0, 8, 4 };
- u8 max = chipset_tp_max[dev_priv->chipset & 0x0f];
- u8 tpnr[GPC_MAX];
- u8 data[TP_MAX];
+ u8 tpnr[GPC_MAX], data[TP_MAX];
memcpy(tpnr, priv->tp_nr, sizeof(priv->tp_nr));
memset(data, 0x1f, sizeof(data));
@@
-1804,7
+1800,7
@@
nvc0_grctx_generate(struct nouveau_channel *chan)
data[tp] = gpc;
}
- for (i = 0; i <
max /
4; i++)
+ for (i = 0; i < 4; i++)
nv_wr32(dev, 0x4060a8 + (i * 4), ((u32 *)data)[i]);
}