summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 27fae00)
raw | patch | inline | side by side (parent: 27fae00)
author | Ben Skeggs <skeggsb@gmail.com> | |
Thu, 13 Nov 2008 02:04:21 +0000 (13:04 +1100) | ||
committer | Ben Skeggs <skeggsb@gmail.com> | |
Mon, 26 Jan 2009 22:36:08 +0000 (08:36 +1000) |
shared-core/nouveau_object.c | patch | blob | history | |
shared-core/nv04_instmem.c | patch | blob | history |
index 5a44d41e654342eff4fb1a250ad38f8fa39025ce..19325f3725e811ab440128beb4a213016ce6ebab 100644 (file)
ref->channel, co, INSTANCE_RD(ramht, co/4));
co += 8;
- if (co >= dev_priv->ramht_size) {
- DRM_INFO("no space left after collision\n");
+ if (co >= dev_priv->ramht_size)
co = 0;
- /* exit as it seems to cause crash with nouveau_demo and
- * 0xdead0001 object */
- break;
- }
} while (co != ho);
DRM_ERROR("RAMHT space exhausted. ch=%d\n", ref->channel);
index 804f9a75199ca1877a9d04f64abb490a670ab6d7..7b58aa418d3750c6150829e5ec2ee50ceae11472 100644 (file)
*/
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); /* nr entries */
+ dev_priv->ramht_size *= 8; /* 2 32-bit values per entry in RAMHT */
DRM_DEBUG("RAMHT offset=0x%x, size=%d\n", dev_priv->ramht_offset,
dev_priv->ramht_size);