diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-10-12 11:01:43 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-11-20 01:09:35 -0500 |
commit | be013367fd6fbab52ddf6f76c243f4109090c890 (patch) | |
tree | 1fcfd1146c1e5e6d4299e754c179c03d2d3df6d0 /drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | |
parent | 0355cf3a0f49e26f4b84d9da7189b2324cf1df6d (diff) |
drm/vmwgfx: remove use of fence_obj_args
It's always hardcoded to the same value.
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, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c index 9826fbc88154..da12922b6313 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | |||
@@ -318,19 +318,16 @@ static int vmw_sync_obj_flush(void *sync_obj, void *sync_arg) | |||
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, void *sync_arg) |
320 | { | 320 | { |
321 | unsigned long flags = (unsigned long) sync_arg; | ||
322 | return vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj, | 321 | return vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj, |
323 | (uint32_t) flags); | 322 | DRM_VMW_FENCE_FLAG_EXEC); |
324 | 323 | ||
325 | } | 324 | } |
326 | 325 | ||
327 | static int vmw_sync_obj_wait(void *sync_obj, void *sync_arg, | 326 | static int vmw_sync_obj_wait(void *sync_obj, void *sync_arg, |
328 | bool lazy, bool interruptible) | 327 | bool lazy, bool interruptible) |
329 | { | 328 | { |
330 | unsigned long flags = (unsigned long) sync_arg; | ||
331 | |||
332 | return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj, | 329 | return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj, |
333 | (uint32_t) flags, | 330 | DRM_VMW_FENCE_FLAG_EXEC, |
334 | lazy, interruptible, | 331 | lazy, interruptible, |
335 | VMW_FENCE_WAIT_TIMEOUT); | 332 | VMW_FENCE_WAIT_TIMEOUT); |
336 | } | 333 | } |