diff options
| author | James Zhu <[email protected]> | 2022-12-17 15:51:04 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2023-06-09 13:51:27 +0000 |
| commit | da044aaeb31ac11e733a667763487508433f3ede (patch) | |
| tree | 398ff73bcdab2e033aad8a223aa7685a44cda5ed /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
| parent | drm/amdgpu: add fwlog support on vcn_v4_0_3 (diff) | |
| download | kernel-da044aaeb31ac11e733a667763487508433f3ede.tar.gz kernel-da044aaeb31ac11e733a667763487508433f3ede.zip | |
drm/amdgpu: add unified queue support on vcn_v4_0_3
Add unified queue support on vcn_v4_0_3.
Signed-off-by: James Zhu <[email protected]>
Acked-by Leo Liu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 72eb12aa2e8d..2e28b19e741e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -1004,11 +1004,14 @@ error: int amdgpu_vcn_unified_ring_test_ib(struct amdgpu_ring *ring, long timeout) { + struct amdgpu_device *adev = ring->adev; long r; - r = amdgpu_vcn_enc_ring_test_ib(ring, timeout); - if (r) - goto error; + if (adev->ip_versions[UVD_HWIP][0] != IP_VERSION(4, 0, 3)) { + r = amdgpu_vcn_enc_ring_test_ib(ring, timeout); + if (r) + goto error; + } r = amdgpu_vcn_dec_sw_ring_test_ib(ring, timeout); |