| .. | .. |
|---|
| 516 | 516 | long timeout, |
|---|
| 517 | 517 | struct intel_rps_client *rps_client) |
|---|
| 518 | 518 | { |
|---|
| 519 | | - unsigned int seq = __read_seqcount_begin(&resv->seq); |
|---|
| 519 | + unsigned int seq = read_seqbegin(&resv->seq); |
|---|
| 520 | 520 | struct dma_fence *excl; |
|---|
| 521 | 521 | bool prune_fences = false; |
|---|
| 522 | 522 | |
|---|
| .. | .. |
|---|
| 569 | 569 | * signaled and that the reservation object has not been changed (i.e. |
|---|
| 570 | 570 | * no new fences have been added). |
|---|
| 571 | 571 | */ |
|---|
| 572 | | - if (prune_fences && !__read_seqcount_retry(&resv->seq, seq)) { |
|---|
| 572 | + if (prune_fences && !read_seqretry(&resv->seq, seq)) { |
|---|
| 573 | 573 | if (reservation_object_trylock(resv)) { |
|---|
| 574 | | - if (!__read_seqcount_retry(&resv->seq, seq)) |
|---|
| 574 | + if (!read_seqretry(&resv->seq, seq)) |
|---|
| 575 | 575 | reservation_object_add_excl_fence(resv, NULL); |
|---|
| 576 | 576 | reservation_object_unlock(resv); |
|---|
| 577 | 577 | } |
|---|
| .. | .. |
|---|
| 4719 | 4719 | * |
|---|
| 4720 | 4720 | */ |
|---|
| 4721 | 4721 | retry: |
|---|
| 4722 | | - seq = raw_read_seqcount(&obj->resv->seq); |
|---|
| 4722 | + seq = read_seqbegin(&obj->resv->seq); |
|---|
| 4723 | 4723 | |
|---|
| 4724 | 4724 | /* Translate the exclusive fence to the READ *and* WRITE engine */ |
|---|
| 4725 | 4725 | args->busy = busy_check_writer(rcu_dereference(obj->resv->fence_excl)); |
|---|
| .. | .. |
|---|
| 4737 | 4737 | } |
|---|
| 4738 | 4738 | } |
|---|
| 4739 | 4739 | |
|---|
| 4740 | | - if (args->busy && read_seqcount_retry(&obj->resv->seq, seq)) |
|---|
| 4740 | + if (args->busy && read_seqretry(&obj->resv->seq, seq)) |
|---|
| 4741 | 4741 | goto retry; |
|---|
| 4742 | 4742 | |
|---|
| 4743 | 4743 | err = 0; |
|---|