aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_mem.c
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2010-10-20 15:50:24 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 00:11:07 -0500
commit382d62e524db528cdf53563ad9a018adc170dfde (patch)
tree84a7268a64ce58a4dfe533b4e3a5cef79b883053 /drivers/gpu/drm/nouveau/nouveau_mem.c
parent5f80198e43cf96542923269ccb607052e5f144cc (diff)
drm/nouveau: fix annoying nouveau_fence type issue
nouveau_fence_* functions are not type safe, which could lead to bugs. Additionally every use of nouveau_fence_unref had to cast struct nouveau_fence to void **. Fix it by renaming old functions and creating static inline functions with new prototypes. We still need old functions, because we pass function pointers to ttm. As we are wrapping functions, drop unused "void *arg" parameter where possible. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index fe4a30dc4b42..a7c3e08aa7b5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -54,7 +54,7 @@ nv10_mem_set_region_tiling(struct drm_device *dev, int i, uint32_t addr,
54 tile->addr = addr; 54 tile->addr = addr;
55 tile->size = size; 55 tile->size = size;
56 tile->used = !!pitch; 56 tile->used = !!pitch;
57 nouveau_fence_unref((void **)&tile->fence); 57 nouveau_fence_unref(&tile->fence);
58 58
59 pfifo->reassign(dev, false); 59 pfifo->reassign(dev, false);
60 pfifo->cache_pull(dev, false); 60 pfifo->cache_pull(dev, false);
@@ -87,7 +87,7 @@ nv10_mem_set_tiling(struct drm_device *dev, uint32_t addr, uint32_t size,
87 continue; 87 continue;
88 88
89 if (tile->fence && 89 if (tile->fence &&
90 !nouveau_fence_signalled(tile->fence, NULL)) 90 !nouveau_fence_signalled(tile->fence))
91 /* Pending tile region. */ 91 /* Pending tile region. */
92 continue; 92 continue;
93 93