diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-01 01:24:31 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 02:20:14 -0400 |
commit | a8eaebc6c52bb0cd243b4cb421068f42d378be9c (patch) | |
tree | 12f796e5210d51f78b9fc6ddd4750cf1421373c2 /drivers/gpu/drm/nouveau/nv04_fbcon.c | |
parent | de3a6c0a3b642c0c350414d63298a1b19a009290 (diff) |
drm/nouveau: remove nouveau_gpuobj_ref completely, replace with sanity
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_fbcon.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv04_fbcon.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c index 1eeac4fae73..33e4c9388bc 100644 --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "drmP.h" | 25 | #include "drmP.h" |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_ramht.h" | ||
28 | #include "nouveau_fbcon.h" | 29 | #include "nouveau_fbcon.h" |
29 | 30 | ||
30 | void | 31 | void |
@@ -169,11 +170,9 @@ nv04_fbcon_grobj_new(struct drm_device *dev, int class, uint32_t handle) | |||
169 | if (ret) | 170 | if (ret) |
170 | return ret; | 171 | return ret; |
171 | 172 | ||
172 | ret = nouveau_gpuobj_ref_add(dev, dev_priv->channel, handle, obj, NULL); | 173 | ret = nouveau_ramht_insert(dev_priv->channel, handle, obj); |
173 | if (ret) | 174 | nouveau_gpuobj_ref(NULL, &obj); |
174 | return ret; | 175 | return ret; |
175 | |||
176 | return 0; | ||
177 | } | 176 | } |
178 | 177 | ||
179 | int | 178 | int |