diff options
| author | Leo Liu <leo.liu@amd.com> | 2017-02-21 10:38:42 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-05-24 17:41:43 -0400 |
| commit | c3bd304009dee48adbb2b6937b7f4a07c5e4e281 (patch) | |
| tree | 2648a764b1182140eb16b917f8d69fa1b0312f32 /drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |
| parent | 9b257116e784dafc83fd8094ed2bfc12d193d228 (diff) | |
| download | op-kernel-dev-c3bd304009dee48adbb2b6937b7f4a07c5e4e281.zip op-kernel-dev-c3bd304009dee48adbb2b6937b7f4a07c5e4e281.tar.gz | |
drm/amdgpu: enable vcn encode ring tests
Wire up the callback and enable them.
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index f09d2ae..4ddaec3 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c @@ -144,7 +144,7 @@ static int vcn_v1_0_hw_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_ring *ring = &adev->vcn.ring_dec; - int r; + int i, r; r = vcn_v1_0_start(adev); if (r) @@ -157,9 +157,19 @@ static int vcn_v1_0_hw_init(void *handle) goto done; } + for (i = 0; i < adev->vcn.num_enc_rings; ++i) { + ring = &adev->vcn.ring_enc[i]; + ring->ready = true; + r = amdgpu_ring_test_ring(ring); + if (r) { + ring->ready = false; + goto done; + } + } + done: if (!r) - DRM_INFO("VCN decode initialized successfully.\n"); + DRM_INFO("VCN decode and encode initialized successfully.\n"); return r; } @@ -930,6 +940,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .emit_ib = vcn_v1_0_enc_ring_emit_ib, .emit_fence = vcn_v1_0_enc_ring_emit_fence, .emit_vm_flush = vcn_v1_0_enc_ring_emit_vm_flush, + .test_ring = amdgpu_vcn_enc_ring_test_ring, .insert_nop = amdgpu_ring_insert_nop, .insert_end = vcn_v1_0_enc_ring_insert_end, .pad_ib = amdgpu_ring_generic_pad_ib, |
