diff options
| author |   Dave Airlie <airlied@redhat.com> | 2022-05-03 16:08:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-05-03 16:08:48 +1000 |
| commit | e954d2c94d007afe487044ecfa48f2518643df0e (patch) | |
| tree | 7903ee4cf7d9387e5bb5285f86a2a82b2eacab44 /drivers/gpu/drm/radeon | |
| parent | Merge tag 'drm-misc-next-2022-04-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | Linux 5.18-rc5 (diff) | |
| download | linux-dev-e954d2c94d007afe487044ecfa48f2518643df0e.tar.xz linux-dev-e954d2c94d007afe487044ecfa48f2518643df0e.zip | |
Backmerge tag 'v5.18-rc5' of git://git.kernel.org/pub/scm/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 <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c index 49bbb2266c0f..6416f129e090 100644 --- a/drivers/gpu/drm/radeon/radeon_sync.c +++ b/drivers/gpu/drm/radeon/radeon_sync.c @@ -96,7 +96,7 @@ int radeon_sync_resv(struct radeon_device *rdev, 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, dma_resv_usage_rw(!shared), f) { fence = to_radeon_fence(f); if (fence && fence->rdev == rdev) radeon_sync_fence(sync, fence); |