diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
| commit | 3d3a96ad4e5596187236898ca241515a21661b69 (patch) | |
| tree | 89b2b0900cf02235741fa670e7947babc8959ebe /shared-core/nouveau_object.c | |
| parent | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (diff) | |
| parent | e349b58b4a6ebfe299720cb921039a600c145e65 (diff) | |
Merge branch 'origin' into bo-set-pin
Diffstat (limited to 'shared-core/nouveau_object.c')
| -rw-r--r-- | shared-core/nouveau_object.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c index e0cb334f..fbce7702 100644 --- a/shared-core/nouveau_object.c +++ b/shared-core/nouveau_object.c @@ -141,8 +141,13 @@ nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref) ref->channel, co, INSTANCE_RD(ramht, co/4)); co += 8; - if (co >= dev_priv->ramht_size) + if (co >= dev_priv->ramht_size) { + DRM_INFO("no space left after collision\n"); 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); |