diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-25 12:39:38 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-10-03 09:19:16 -0400 |
| commit | 392a250bd080e296f97ccc7e91b051a6b5da0ff1 (patch) | |
| tree | 9c945db20239a93068c5d6d0b26efda883e6ba24 /drivers/gpu/drm/radeon/cik.c | |
| parent | a0e847641cd7239661ff1b39db0afb0e2992026f (diff) | |
| download | talos-op-linux-392a250bd080e296f97ccc7e91b051a6b5da0ff1.tar.gz talos-op-linux-392a250bd080e296f97ccc7e91b051a6b5da0ff1.zip | |
drm/radeon: cope with foreign fences inside the reservation object
Not the whole world is a radeon! :-)
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/cik.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 05c2f43421aa..fc49a8d0fe00 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -3993,7 +3993,7 @@ struct radeon_fence *cik_copy_cpdma(struct radeon_device *rdev, return ERR_PTR(r); } - radeon_semaphore_sync_resv(sem, resv, false); + radeon_semaphore_sync_resv(rdev, sem, resv, false); radeon_semaphore_sync_rings(rdev, sem, ring->idx); for (i = 0; i < num_loops; i++) { |
