summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_instmem.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-08-13 10:22:41 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-08-17 11:59:24 +1000
commit46d4cae20038bcb2511cba0c86f0be2d11520369 (patch)
tree63e4570cffcc229e9621c45283e65df85b3bab61 /drivers/gpu/drm/nouveau/nv50_instmem.c
parent45a68a072ee3b7f8fbd84b946aac827cc61256b0 (diff)
downloadop-kernel-dev-46d4cae20038bcb2511cba0c86f0be2d11520369.zip
op-kernel-dev-46d4cae20038bcb2511cba0c86f0be2d11520369.tar.gz
drm/nv50-nvc0: ramht_size is meant to be in bytes, not entries
Fixes an infinite loop that can happen in RAMHT lookup. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_instmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
index 37c7b48..c95bf9b 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -278,7 +278,7 @@ nv50_instmem_init(struct drm_device *dev)
/*XXX: incorrect, but needed to make hash func "work" */
dev_priv->ramht_offset = 0x10000;
dev_priv->ramht_bits = 9;
- dev_priv->ramht_size = (1 << dev_priv->ramht_bits);
+ dev_priv->ramht_size = (1 << dev_priv->ramht_bits) * 8;
return 0;
}
OpenPOWER on IntegriCloud