History

drm/ttm: remove sync_arg from driver functions

Maarten Lankhorst committed 14 years ago

Commit dedfdff1 parent b03640b5 files · +15 −17Browse files

Unified · Split

5 files
  1. drivers/gpu/drm/nouveau/nouveau_bo.c +3 −3
  2. drivers/gpu/drm/radeon/radeon_ttm.c +3 −4
  3. drivers/gpu/drm/ttm/ttm_bo.c +3 −3
  4. drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c +3 −4
  5. include/drm/ttm/ttm_bo_driver.h +3 −3
drivers/gpu/drm/nouveau/nouveau_bo.c+3−3
@@ -1472,19 +1472,19 @@ nouveau_bo_fence_ref(void *sync_obj) · 1471 unmodified lines
1472}1472}
1473 1473
1474static bool1474static bool
1475nouveau_bo_fence_signalled(void *sync_obj, void *sync_arg)1475nouveau_bo_fence_signalled(void *sync_obj)
1476{1476{
1477 return nouveau_fence_done(sync_obj);1477 return nouveau_fence_done(sync_obj);
1478}1478}
1479 1479
1480static int1480static int
1481nouveau_bo_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)1481nouveau_bo_fence_wait(void *sync_obj, bool lazy, bool intr)
1482{1482{
1483 return nouveau_fence_wait(sync_obj, lazy, intr);1483 return nouveau_fence_wait(sync_obj, lazy, intr);
1484}1484}
1485 1485
1486static int1486static int
1487nouveau_bo_fence_flush(void *sync_obj, void *sync_arg)1487nouveau_bo_fence_flush(void *sync_obj)
1488{1488{
1489 return 0;1489 return 0;
1490}1490}
drivers/gpu/drm/radeon/radeon_ttm.c+3−4
@@ -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
474static int radeon_sync_obj_wait(void *sync_obj, void *sync_arg,474static int radeon_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible)
475 bool lazy, bool interruptible)
476{475{
477 return radeon_fence_wait((struct radeon_fence *)sync_obj, interruptible);476 return radeon_fence_wait((struct radeon_fence *)sync_obj, interruptible);
478}477}
479 478
480static int radeon_sync_obj_flush(void *sync_obj, void *sync_arg)479static int radeon_sync_obj_flush(void *sync_obj)
481{480{
482 return 0;481 return 0;
483}482}
@@ -492,7 +491,7 @@ static void *radeon_sync_obj_ref(void *sync_obj) · 8 unmodified lines
492 return radeon_fence_ref((struct radeon_fence *)sync_obj);491 return radeon_fence_ref((struct radeon_fence *)sync_obj);
493}492}
494 493
495static bool radeon_sync_obj_signaled(void *sync_obj, void *sync_arg)494static bool radeon_sync_obj_signaled(void *sync_obj)
496{495{
497 return radeon_fence_signaled((struct radeon_fence *)sync_obj);496 return radeon_fence_signaled((struct radeon_fence *)sync_obj);
498}497}
drivers/gpu/drm/ttm/ttm_bo.c+3−3
@@ -543,7 +543,7 @@ queue: · 542 unmodified lines
543 spin_unlock(&bdev->fence_lock);543 spin_unlock(&bdev->fence_lock);
544 544
545 if (sync_obj) {545 if (sync_obj) {
546 driver->sync_obj_flush(sync_obj, NULL);546 driver->sync_obj_flush(sync_obj);
547 driver->sync_obj_unref(&sync_obj);547 driver->sync_obj_unref(&sync_obj);
548 }548 }
549 schedule_delayed_work(&bdev->wq,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 while (bo->sync_obj) {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 void *tmp_obj = bo->sync_obj;1725 void *tmp_obj = bo->sync_obj;
1726 bo->sync_obj = NULL;1726 bo->sync_obj = NULL;
1727 clear_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);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 sync_obj = driver->sync_obj_ref(bo->sync_obj);1737 sync_obj = driver->sync_obj_ref(bo->sync_obj);
1738 spin_unlock(&bdev->fence_lock);1738 spin_unlock(&bdev->fence_lock);
1739 ret = driver->sync_obj_wait(sync_obj, NULL,1739 ret = driver->sync_obj_wait(sync_obj,
1740 lazy, interruptible);1740 lazy, interruptible);
1741 if (unlikely(ret != 0)) {1741 if (unlikely(ret != 0)) {
1742 driver->sync_obj_unref(&sync_obj);1742 driver->sync_obj_unref(&sync_obj);
drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c+3−4
@@ -310,21 +310,20 @@ static void vmw_sync_obj_unref(void **sync_obj) · 309 unmodified lines
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
313static int vmw_sync_obj_flush(void *sync_obj, void *sync_arg)313static 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
319static bool vmw_sync_obj_signaled(void *sync_obj, void *sync_arg)319static 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
326static int vmw_sync_obj_wait(void *sync_obj, void *sync_arg,326static 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,
include/drm/ttm/ttm_bo_driver.h+3−3
@@ -422,10 +422,10 @@ struct ttm_bo_driver { · 421 unmodified lines
422 * documentation.422 * documentation.
423 */423 */
424 424
425 bool (*sync_obj_signaled) (void *sync_obj, void *sync_arg);425 bool (*sync_obj_signaled) (void *sync_obj);
426 int (*sync_obj_wait) (void *sync_obj, void *sync_arg,426 int (*sync_obj_wait) (void *sync_obj,
427 bool lazy, bool interruptible);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 void (*sync_obj_unref) (void **sync_obj);429 void (*sync_obj_unref) (void **sync_obj);
430 void *(*sync_obj_ref) (void *sync_obj);430 void *(*sync_obj_ref) (void *sync_obj);
431 431

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t