From: Dave Airlie Date: Tue, 3 May 2022 06:08:48 +0000 (+1000) Subject: Backmerge tag 'v5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e954d2c94d007afe487044ecfa48f2518643df0e;p=linux.git Backmerge tag 'v5.18-rc5' of git://git./linux/kernel/git/torvalds/linux into drm-next Linux 5.18-rc5 There was a build fix for arm I wanted in drm-next, so backmerge rather then cherry-pick. Signed-off-by: Dave Airlie --- e954d2c94d007afe487044ecfa48f2518643df0e diff --cc drivers/gpu/drm/radeon/radeon_sync.c index 49bbb2266c0fe,f63efd8d5e524..6416f129e0905 --- a/drivers/gpu/drm/radeon/radeon_sync.c +++ b/drivers/gpu/drm/radeon/radeon_sync.c @@@ -96,7 -96,7 +96,7 @@@ int radeon_sync_resv(struct radeon_devi struct dma_fence *f; int r = 0; - dma_resv_for_each_fence(&cursor, resv, dma_resv_usage_rw(shared), f) { - dma_resv_for_each_fence(&cursor, resv, !shared, f) { ++ dma_resv_for_each_fence(&cursor, resv, dma_resv_usage_rw(!shared), f) { fence = to_radeon_fence(f); if (fence && fence->rdev == rdev) radeon_sync_fence(sync, fence);