diff options
| author | Ben Skeggs | 2011-07-11 07:54:20 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2011-09-20 08:08:08 +0200 |
| commit | 64c2502b77bf95b0f30d470109c2829cfa7d200e (patch) | |
| tree | 247851e8c2394097c8e9153e75c7ac9766b5b2b2 /drivers/gpu/drm/nouveau/nvc0_grctx.c | |
| parent | drm/nvd0: lets not attempt to dereference a nv50_display pointer (diff) | |
| download | kernel-qcow2-linux-64c2502b77bf95b0f30d470109c2829cfa7d200e.tar.gz kernel-qcow2-linux-64c2502b77bf95b0f30d470109c2829cfa7d200e.tar.xz kernel-qcow2-linux-64c2502b77bf95b0f30d470109c2829cfa7d200e.zip | |
drm/nvc0/gr: remove max tpc count info
Just assume a max of 16 everywhere, and hope it's okay.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvc0_grctx.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_grctx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c index 0c9737a49149..dd0e6a736b3b 100644 --- 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]); } |