diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-10-12 11:04:00 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-11-20 01:10:10 -0500 |
commit | dedfdffd448aea2543b59fd504b92b8212ab3b7d (patch) | |
tree | 0a564865acb120e412e5718742ca7a6a481de98a /drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | |
parent | b03640b1de2eb349c2453d060d0bd0b0486e29b8 (diff) |
drm/ttm: remove sync_arg from driver functions
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-By: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c index da12922b6313..ef1109c8fec8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | |||
@@ -310,21 +310,20 @@ static void vmw_sync_obj_unref(void **sync_obj) | |||
310 | vmw_fence_obj_unreference((struct vmw_fence_obj **) sync_obj); | 310 | vmw_fence_obj_unreference((struct vmw_fence_obj **) sync_obj); |
311 | } | 311 | } |
312 | 312 | ||
313 | static int vmw_sync_obj_flush(void *sync_obj, void *sync_arg) | 313 | static int vmw_sync_obj_flush(void *sync_obj) |
314 | { | 314 | { |
315 | vmw_fence_obj_flush((struct vmw_fence_obj *) sync_obj); | 315 | vmw_fence_obj_flush((struct vmw_fence_obj *) sync_obj); |
316 | return 0; | 316 | return 0; |
317 | } | 317 | } |
318 | 318 | ||
319 | static bool vmw_sync_obj_signaled(void *sync_obj, void *sync_arg) | 319 | static bool vmw_sync_obj_signaled(void *sync_obj) |
320 | { | 320 | { |
321 | return vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj, | 321 | return vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj, |
322 | DRM_VMW_FENCE_FLAG_EXEC); | 322 | DRM_VMW_FENCE_FLAG_EXEC); |
323 | 323 | ||
324 | } | 324 | } |
325 | 325 | ||
326 | static int vmw_sync_obj_wait(void *sync_obj, void *sync_arg, | 326 | static int vmw_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible) |
327 | bool lazy, bool interruptible) | ||
328 | { | 327 | { |
329 | return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj, | 328 | return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj, |
330 | DRM_VMW_FENCE_FLAG_EXEC, | 329 | DRM_VMW_FENCE_FLAG_EXEC, |