mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-27 03:49:57 -04:00
drm/amdgpu/vcn: move more instanced data to vcn_instance
Move more per instance data into the per instance structure. v2: index instances directly on vcn1.0 and 2.0 to make it clear that they only support a single instance (Lijo) v3: fix typo on vcn 2.5 Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com> (v2) Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
@@ -607,12 +607,12 @@ static void jpeg_v1_0_ring_begin_use(struct amdgpu_ring *ring)
|
||||
bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.inst[0].idle_work);
|
||||
int cnt = 0;
|
||||
|
||||
mutex_lock(&adev->vcn.vcn1_jpeg1_workaround);
|
||||
mutex_lock(&adev->vcn.inst[0].vcn1_jpeg1_workaround);
|
||||
|
||||
if (amdgpu_fence_wait_empty(&adev->vcn.inst->ring_dec))
|
||||
DRM_ERROR("JPEG dec: vcn dec ring may not be empty\n");
|
||||
|
||||
for (cnt = 0; cnt < adev->vcn.num_enc_rings; cnt++) {
|
||||
for (cnt = 0; cnt < adev->vcn.inst[0].num_enc_rings; cnt++) {
|
||||
if (amdgpu_fence_wait_empty(&adev->vcn.inst->ring_enc[cnt]))
|
||||
DRM_ERROR("JPEG dec: vcn enc ring[%d] may not be empty\n", cnt);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user