diff options
| author | Christian König <christian.koenig@amd.com> | 2022-04-04 12:59:32 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-04-07 12:53:54 +0200 |
| commit | 91f0c245dd5cd7039090283031b485384b315852 (patch) | |
| tree | 8d085a262e630bdbc36454d585ac708e388d7c49 /drivers/gpu/drm/radeon/radeon_uvd.c | |
| parent | c35fcfa344c7544c899610dd5e512f7d630a152c (diff) | |
| download | linux-91f0c245dd5cd7039090283031b485384b315852.tar.gz linux-91f0c245dd5cd7039090283031b485384b315852.tar.bz2 linux-91f0c245dd5cd7039090283031b485384b315852.zip | |
drm/radeon: use DMA_RESV_USAGE_KERNEL
Always wait for kernel fences before kmap and not only for UVD kmaps.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220407085946.744568-7-christian.koenig@amd.com
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_uvd.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c index a50750740ab0..a2cda184b2b2 100644 --- a/drivers/gpu/drm/radeon/radeon_uvd.c +++ b/drivers/gpu/drm/radeon/radeon_uvd.c @@ -470,24 +470,16 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo, int32_t *msg, msg_type, handle; unsigned img_size = 0; void *ptr; - long r; - int i; + int i, r; if (offset & 0x3F) { DRM_ERROR("UVD messages must be 64 byte aligned!\n"); return -EINVAL; } - r = dma_resv_wait_timeout(bo->tbo.base.resv, DMA_RESV_USAGE_WRITE, - false, MAX_SCHEDULE_TIMEOUT); - if (r <= 0) { - DRM_ERROR("Failed waiting for UVD message (%ld)!\n", r); - return r ? r : -ETIME; - } - r = radeon_bo_kmap(bo, &ptr); if (r) { - DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r); + DRM_ERROR("Failed mapping the UVD message (%d)!\n", r); return r; } |