Fixes for v6.7-rc4: - Revert panel fixes as they require exporting device_is_dependent. - Do not double add fences in dma_resv_add_fence. - Fix GPUVM license identifier. - Assorted nouveau fixes. - Fix error check for nt36523.
Showing the changes to include/linux (1 of 10 files). Show all
Unified · Split
| @@ -498,6 +498,21 @@ static inline bool dma_fence_is_later(struct dma_fence *f1, · 497 unmodified lines | |||
| 498 | return __dma_fence_is_later(f1->seqno, f2->seqno, f1->ops); | 498 | return __dma_fence_is_later(f1->seqno, f2->seqno, f1->ops); |
| 499 | } | 499 | } |
| 500 | 500 | ||
| 501 | /** | ||
| 502 | * dma_fence_is_later_or_same - return true if f1 is later or same as f2 | ||
| 503 | * @f1: the first fence from the same context | ||
| 504 | * @f2: the second fence from the same context | ||
| 505 | * | ||
| 506 | * Returns true if f1 is chronologically later than f2 or the same fence. Both | ||
| 507 | * fences must be from the same context, since a seqno is not re-used across | ||
| 508 | * contexts. | ||
| 509 | */ | ||
| 510 | static inline bool dma_fence_is_later_or_same(struct dma_fence *f1, | ||
| 511 | struct dma_fence *f2) | ||
| 512 | { | ||
| 513 | return f1 == f2 || dma_fence_is_later(f1, f2); | ||
| 514 | } | ||
| 515 | |||
| 501 | /** | 516 | /** |
| 502 | * dma_fence_later - return the chronologically later fence | 517 | * dma_fence_later - return the chronologically later fence |
| 503 | * @f1: the first fence from the same context | 518 | * @f1: the first fence from the same context |