Unified · Split
| @@ -1472,19 +1472,19 @@ nouveau_bo_fence_ref(void *sync_obj) · 1471 unmodified lines | ||
| 1472 | 1472 | } |
| 1473 | 1473 | |
| 1474 | 1474 | static bool |
| 1475 | −nouveau_bo_fence_signalled(void *sync_obj, void *sync_arg) | |
| 1475 | +nouveau_bo_fence_signalled(void *sync_obj) | |
| 1476 | 1476 | { |
| 1477 | 1477 | return nouveau_fence_done(sync_obj); |
| 1478 | 1478 | } |
| 1479 | 1479 | |
| 1480 | 1480 | static int |
| 1481 | −nouveau_bo_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr) | |
| 1481 | +nouveau_bo_fence_wait(void *sync_obj, bool lazy, bool intr) | |
| 1482 | 1482 | { |
| 1483 | 1483 | return nouveau_fence_wait(sync_obj, lazy, intr); |
| 1484 | 1484 | } |
| 1485 | 1485 | |
| 1486 | 1486 | static int |
| 1487 | −nouveau_bo_fence_flush(void *sync_obj, void *sync_arg) | |
| 1487 | +nouveau_bo_fence_flush(void *sync_obj) | |
| 1488 | 1488 | { |
| 1489 | 1489 | return 0; |
| 1490 | 1490 | } |
| @@ -471,13 +471,12 @@ static void radeon_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_re · 470 unmodified lines | ||
| 471 | 471 | { |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | −static int radeon_sync_obj_wait(void *sync_obj, void *sync_arg, | |
| 475 | − bool lazy, bool interruptible) | |
| 474 | +static int radeon_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible) | |
| 476 | 475 | { |
| 477 | 476 | return radeon_fence_wait((struct radeon_fence *)sync_obj, interruptible); |
| 478 | 477 | } |
| 479 | 478 | |
| 480 | −static int radeon_sync_obj_flush(void *sync_obj, void *sync_arg) | |
| 479 | +static int radeon_sync_obj_flush(void *sync_obj) | |
| 481 | 480 | { |
| 482 | 481 | return 0; |
| 483 | 482 | } |
| @@ -492,7 +491,7 @@ static void *radeon_sync_obj_ref(void *sync_obj) · 8 unmodified lines | ||
| 492 | 491 | return radeon_fence_ref((struct radeon_fence *)sync_obj); |
| 493 | 492 | } |
| 494 | 493 | |
| 495 | −static bool radeon_sync_obj_signaled(void *sync_obj, void *sync_arg) | |
| 494 | +static bool radeon_sync_obj_signaled(void *sync_obj) | |
| 496 | 495 | { |
| 497 | 496 | return radeon_fence_signaled((struct radeon_fence *)sync_obj); |
| 498 | 497 | } |
| @@ -543,7 +543,7 @@ queue: · 542 unmodified lines | ||
| 543 | 543 | spin_unlock(&bdev->fence_lock); |
| 544 | 544 | |
| 545 | 545 | if (sync_obj) { |
| 546 | − driver->sync_obj_flush(sync_obj, NULL); | |
| 546 | + driver->sync_obj_flush(sync_obj); | |
| 547 | 547 | driver->sync_obj_unref(&sync_obj); |
| 548 | 548 | } |
| 549 | 549 | schedule_delayed_work(&bdev->wq, |
| @@ -1721,7 +1721,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo, · 1171 unmodified lines | ||
| 1721 | 1721 | |
| 1722 | 1722 | while (bo->sync_obj) { |
| 1723 | 1723 | |
| 1724 | − if (driver->sync_obj_signaled(bo->sync_obj, NULL)) { | |
| 1724 | + if (driver->sync_obj_signaled(bo->sync_obj)) { | |
| 1725 | 1725 | void *tmp_obj = bo->sync_obj; |
| 1726 | 1726 | bo->sync_obj = NULL; |
| 1727 | 1727 | clear_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags); |
| @@ -1736,7 +1736,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo, · 8 unmodified lines | ||
| 1736 | 1736 | |
| 1737 | 1737 | sync_obj = driver->sync_obj_ref(bo->sync_obj); |
| 1738 | 1738 | spin_unlock(&bdev->fence_lock); |
| 1739 | − ret = driver->sync_obj_wait(sync_obj, NULL, | |
| 1739 | + ret = driver->sync_obj_wait(sync_obj, | |
| 1740 | 1740 | lazy, interruptible); |
| 1741 | 1741 | if (unlikely(ret != 0)) { |
| 1742 | 1742 | driver->sync_obj_unref(&sync_obj); |
| @@ -310,21 +310,20 @@ static void vmw_sync_obj_unref(void **sync_obj) · 309 unmodified lines | ||
| 310 | 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 | 315 | vmw_fence_obj_flush((struct vmw_fence_obj *) sync_obj); |
| 316 | 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 | 321 | return vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj, |
| 322 | 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, | |
| 327 | − bool lazy, bool interruptible) | |
| 326 | +static int vmw_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible) | |
| 328 | 327 | { |
| 329 | 328 | return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj, |
| 330 | 329 | DRM_VMW_FENCE_FLAG_EXEC, |
| @@ -422,10 +422,10 @@ struct ttm_bo_driver { · 421 unmodified lines | ||
| 422 | 422 | * documentation. |
| 423 | 423 | */ |
| 424 | 424 | |
| 425 | − bool (*sync_obj_signaled) (void *sync_obj, void *sync_arg); | |
| 426 | − int (*sync_obj_wait) (void *sync_obj, void *sync_arg, | |
| 425 | + bool (*sync_obj_signaled) (void *sync_obj); | |
| 426 | + int (*sync_obj_wait) (void *sync_obj, | |
| 427 | 427 | bool lazy, bool interruptible); |
| 428 | − int (*sync_obj_flush) (void *sync_obj, void *sync_arg); | |
| 428 | + int (*sync_obj_flush) (void *sync_obj); | |
| 429 | 429 | void (*sync_obj_unref) (void **sync_obj); |
| 430 | 430 | void *(*sync_obj_ref) (void *sync_obj); |
| 431 | 431 | |