diff options
author | Christian König <christian.koenig@amd.com> | 2015-07-21 12:02:21 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:50:18 -0400 |
commit | 5430a3ffb0b1902e8aea4ed2ba256b1263126e8d (patch) | |
tree | c73e8f31dc1ef2f698c5f16fb8bc2c8e4d047b12 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 5ceb54c68a28fc8af5cf8d32c4fde29c97dd3c18 (diff) |
drm/amdgpu: fix UVD/VCE fence handling
We need to return the sequence number to userspace
even when we don't use user fences.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 551143287698..e6c26c1716b6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -414,8 +414,6 @@ struct amdgpu_user_fence { | |||
414 | struct amdgpu_bo *bo; | 414 | struct amdgpu_bo *bo; |
415 | /* write-back address offset to bo start */ | 415 | /* write-back address offset to bo start */ |
416 | uint32_t offset; | 416 | uint32_t offset; |
417 | /* resulting sequence number */ | ||
418 | uint64_t sequence; | ||
419 | }; | 417 | }; |
420 | 418 | ||
421 | int amdgpu_fence_driver_init(struct amdgpu_device *adev); | 419 | int amdgpu_fence_driver_init(struct amdgpu_device *adev); |
@@ -847,6 +845,8 @@ struct amdgpu_ib { | |||
847 | uint32_t gws_base, gws_size; | 845 | uint32_t gws_base, gws_size; |
848 | uint32_t oa_base, oa_size; | 846 | uint32_t oa_base, oa_size; |
849 | uint32_t flags; | 847 | uint32_t flags; |
848 | /* resulting sequence number */ | ||
849 | uint64_t sequence; | ||
850 | }; | 850 | }; |
851 | 851 | ||
852 | enum amdgpu_ring_type { | 852 | enum amdgpu_ring_type { |