| 41,7 → 41,7 |
|---|
| struct radeon_fence *fence = NULL; |
| int i, r; |
| |
| start_jiffies = GetTimerTicks(); |
| start_jiffies = jiffies; |
| for (i = 0; i < n; i++) { |
| switch (flag) { |
| case RADEON_BENCHMARK_COPY_DMA: |
| 65,7 → 65,7 |
|---|
| goto exit_do_move; |
| radeon_fence_unref(&fence); |
| } |
| end_jiffies = GetTimerTicks(); |
| end_jiffies = jiffies; |
| r = jiffies_to_msecs(end_jiffies - start_jiffies); |
| |
| exit_do_move: |
| 100,7 → 100,7 |
|---|
| ENTER(); |
| |
| n = RADEON_BENCHMARK_ITERATIONS; |
| r = radeon_bo_create(rdev, size, PAGE_SIZE, true, sdomain, NULL, &sobj); |
| r = radeon_bo_create(rdev, size, PAGE_SIZE, true, sdomain, 0, NULL, &sobj); |
| if (r) { |
| goto out_cleanup; |
| } |
| 108,11 → 108,11 |
|---|
| if (unlikely(r != 0)) |
| goto out_cleanup; |
| r = radeon_bo_pin(sobj, sdomain, &saddr); |
| // radeon_bo_unreserve(sobj); |
| radeon_bo_unreserve(sobj); |
| if (r) { |
| goto out_cleanup; |
| } |
| r = radeon_bo_create(rdev, size, PAGE_SIZE, true, ddomain, NULL, &dobj); |
| r = radeon_bo_create(rdev, size, PAGE_SIZE, true, ddomain, 0, NULL, &dobj); |
| if (r) { |
| goto out_cleanup; |
| } |
| 120,16 → 120,13 |
|---|
| if (unlikely(r != 0)) |
| goto out_cleanup; |
| r = radeon_bo_pin(dobj, ddomain, &daddr); |
| // radeon_bo_unreserve(dobj); |
| radeon_bo_unreserve(dobj); |
| if (r) { |
| goto out_cleanup; |
| } |
| dbgprintf("done\n"); |
| |
| /* r100 doesn't have dma engine so skip the test */ |
| /* also, VRAM-to-VRAM test doesn't make much sense for DMA */ |
| /* skip it as well if domains are the same */ |
| if ((rdev->asic->copy.dma) && (sdomain != ddomain)) { |
| if (rdev->asic->copy.dma) { |
| time = radeon_benchmark_do_move(rdev, size, saddr, daddr, |
| RADEON_BENCHMARK_COPY_DMA, n); |
| if (time < 0) |
| 139,6 → 136,7 |
|---|
| sdomain, ddomain, "dma"); |
| } |
| |
| if (rdev->asic->copy.blit) { |
| time = radeon_benchmark_do_move(rdev, size, saddr, daddr, |
| RADEON_BENCHMARK_COPY_BLIT, n); |
| if (time < 0) |
| 146,6 → 144,7 |
|---|
| if (time > 0) |
| radeon_benchmark_log_results(n, size, time, |
| sdomain, ddomain, "blit"); |
| } |
| |
| out_cleanup: |
| if (sobj) { |