| .. | .. |
|---|
| 21 | 21 | * |
|---|
| 22 | 22 | * Authors: Jerome Glisse |
|---|
| 23 | 23 | */ |
|---|
| 24 | | -#include <drm/drmP.h> |
|---|
| 24 | + |
|---|
| 25 | 25 | #include <drm/radeon_drm.h> |
|---|
| 26 | 26 | #include "radeon_reg.h" |
|---|
| 27 | 27 | #include "radeon.h" |
|---|
| .. | .. |
|---|
| 35 | 35 | static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size, |
|---|
| 36 | 36 | uint64_t saddr, uint64_t daddr, |
|---|
| 37 | 37 | int flag, int n, |
|---|
| 38 | | - struct reservation_object *resv) |
|---|
| 38 | + struct dma_resv *resv) |
|---|
| 39 | 39 | { |
|---|
| 40 | 40 | unsigned long start_jiffies; |
|---|
| 41 | 41 | unsigned long end_jiffies; |
|---|
| .. | .. |
|---|
| 122 | 122 | if (rdev->asic->copy.dma) { |
|---|
| 123 | 123 | time = radeon_benchmark_do_move(rdev, size, saddr, daddr, |
|---|
| 124 | 124 | RADEON_BENCHMARK_COPY_DMA, n, |
|---|
| 125 | | - dobj->tbo.resv); |
|---|
| 125 | + dobj->tbo.base.resv); |
|---|
| 126 | 126 | if (time < 0) |
|---|
| 127 | 127 | goto out_cleanup; |
|---|
| 128 | 128 | if (time > 0) |
|---|
| .. | .. |
|---|
| 133 | 133 | if (rdev->asic->copy.blit) { |
|---|
| 134 | 134 | time = radeon_benchmark_do_move(rdev, size, saddr, daddr, |
|---|
| 135 | 135 | RADEON_BENCHMARK_COPY_BLIT, n, |
|---|
| 136 | | - dobj->tbo.resv); |
|---|
| 136 | + dobj->tbo.base.resv); |
|---|
| 137 | 137 | if (time < 0) |
|---|
| 138 | 138 | goto out_cleanup; |
|---|
| 139 | 139 | if (time > 0) |
|---|