diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-08-13 10:22:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-08-17 11:59:24 +1000 |
| commit | 46d4cae20038bcb2511cba0c86f0be2d11520369 (patch) | |
| tree | 63e4570cffcc229e9621c45283e65df85b3bab61 | |
| parent | 45a68a072ee3b7f8fbd84b946aac827cc61256b0 (diff) | |
| download | linux-3.10-46d4cae20038bcb2511cba0c86f0be2d11520369.tar.gz linux-3.10-46d4cae20038bcb2511cba0c86f0be2d11520369.tar.bz2 linux-3.10-46d4cae20038bcb2511cba0c86f0be2d11520369.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_instmem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 37c7b48ab24..c95bf9b681d 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; } diff --git a/drivers/gpu/drm/nouveau/nvc0_instmem.c b/drivers/gpu/drm/nouveau/nvc0_instmem.c index 3ab3cdc4217..854e0d72fc0 100644 --- a/drivers/gpu/drm/nouveau/nvc0_instmem.c +++ b/drivers/gpu/drm/nouveau/nvc0_instmem.c @@ -221,7 +221,7 @@ nvc0_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; } |