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
14721472 }
14731473
14741474 static bool
1475−nouveau_bo_fence_signalled(void *sync_obj, void *sync_arg)
1475+nouveau_bo_fence_signalled(void *sync_obj)
14761476 {
14771477 return nouveau_fence_done(sync_obj);
14781478 }
14791479
14801480 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)
14821482 {
14831483 return nouveau_fence_wait(sync_obj, lazy, intr);
14841484 }
14851485
14861486 static int
1487−nouveau_bo_fence_flush(void *sync_obj, void *sync_arg)
1487+nouveau_bo_fence_flush(void *sync_obj)
14881488 {
14891489 return 0;
14901490 }
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
471471 {
472472 }
473473
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)
476475 {
477476 return radeon_fence_wait((struct radeon_fence *)sync_obj, interruptible);
478477 }
479478
480−static int radeon_sync_obj_flush(void *sync_obj, void *sync_arg)
479+static int radeon_sync_obj_flush(void *sync_obj)
481480 {
482481 return 0;
483482 }
@@ -492,7 +491,7 @@ static void *radeon_sync_obj_ref(void *sync_obj) · 8 unmodified lines
492491 return radeon_fence_ref((struct radeon_fence *)sync_obj);
493492 }
494493
495−static bool radeon_sync_obj_signaled(void *sync_obj, void *sync_arg)
494+static bool radeon_sync_obj_signaled(void *sync_obj)
496495 {
497496 return radeon_fence_signaled((struct radeon_fence *)sync_obj);
498497 }
drivers/gpu/drm/ttm/ttm_bo.c+3−3
@@ -543,7 +543,7 @@ queue: · 542 unmodified lines
543543 spin_unlock(&bdev->fence_lock);
544544
545545 if (sync_obj) {
546− driver->sync_obj_flush(sync_obj, NULL);
546+ driver->sync_obj_flush(sync_obj);
547547 driver->sync_obj_unref(&sync_obj);
548548 }
549549 schedule_delayed_work(&bdev->wq,
@@ -1721,7 +1721,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo, · 1171 unmodified lines
17211721
17221722 while (bo->sync_obj) {
17231723
1724− if (driver->sync_obj_signaled(bo->sync_obj, NULL)) {
1724+ if (driver->sync_obj_signaled(bo->sync_obj)) {
17251725 void *tmp_obj = bo->sync_obj;
17261726 bo->sync_obj = NULL;
17271727 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
17361736
17371737 sync_obj = driver->sync_obj_ref(bo->sync_obj);
17381738 spin_unlock(&bdev->fence_lock);
1739− ret = driver->sync_obj_wait(sync_obj, NULL,
1739+ ret = driver->sync_obj_wait(sync_obj,
17401740 lazy, interruptible);
17411741 if (unlikely(ret != 0)) {
17421742 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
310310 vmw_fence_obj_unreference((struct vmw_fence_obj **) sync_obj);
311311 }
312312
313−static int vmw_sync_obj_flush(void *sync_obj, void *sync_arg)
313+static int vmw_sync_obj_flush(void *sync_obj)
314314 {
315315 vmw_fence_obj_flush((struct vmw_fence_obj *) sync_obj);
316316 return 0;
317317 }
318318
319−static bool vmw_sync_obj_signaled(void *sync_obj, void *sync_arg)
319+static bool vmw_sync_obj_signaled(void *sync_obj)
320320 {
321321 return vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj,
322322 DRM_VMW_FENCE_FLAG_EXEC);
323323
324324 }
325325
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)
328327 {
329328 return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj,
330329 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
422422 * documentation.
423423 */
424424
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,
427427 bool lazy, bool interruptible);
428− int (*sync_obj_flush) (void *sync_obj, void *sync_arg);
428+ int (*sync_obj_flush) (void *sync_obj);
429429 void (*sync_obj_unref) (void **sync_obj);
430430 void *(*sync_obj_ref) (void *sync_obj);
431431

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