diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c index ea9850c9224d..d8357290ad09 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | |||
| @@ -66,8 +66,6 @@ static int amdgpu_identity_map(struct amdgpu_device *adev, | |||
| 66 | u32 ring, | 66 | u32 ring, |
| 67 | struct amdgpu_ring **out_ring) | 67 | struct amdgpu_ring **out_ring) |
| 68 | { | 68 | { |
| 69 | u32 instance; | ||
| 70 | |||
| 71 | switch (mapper->hw_ip) { | 69 | switch (mapper->hw_ip) { |
| 72 | case AMDGPU_HW_IP_GFX: | 70 | case AMDGPU_HW_IP_GFX: |
| 73 | *out_ring = &adev->gfx.gfx_ring[ring]; | 71 | *out_ring = &adev->gfx.gfx_ring[ring]; |
| @@ -79,16 +77,13 @@ static int amdgpu_identity_map(struct amdgpu_device *adev, | |||
| 79 | *out_ring = &adev->sdma.instance[ring].ring; | 77 | *out_ring = &adev->sdma.instance[ring].ring; |
| 80 | break; | 78 | break; |
| 81 | case AMDGPU_HW_IP_UVD: | 79 | case AMDGPU_HW_IP_UVD: |
| 82 | instance = ring; | 80 | *out_ring = &adev->uvd.inst[0].ring; |
| 83 | *out_ring = &adev->uvd.inst[instance].ring; | ||
| 84 | break; | 81 | break; |
| 85 | case AMDGPU_HW_IP_VCE: | 82 | case AMDGPU_HW_IP_VCE: |
| 86 | *out_ring = &adev->vce.ring[ring]; | 83 | *out_ring = &adev->vce.ring[ring]; |
| 87 | break; | 84 | break; |
| 88 | case AMDGPU_HW_IP_UVD_ENC: | 85 | case AMDGPU_HW_IP_UVD_ENC: |
| 89 | instance = ring / adev->uvd.num_enc_rings; | 86 | *out_ring = &adev->uvd.inst[0].ring_enc[ring]; |
| 90 | *out_ring = | ||
| 91 | &adev->uvd.inst[instance].ring_enc[ring%adev->uvd.num_enc_rings]; | ||
| 92 | break; | 87 | break; |
| 93 | case AMDGPU_HW_IP_VCN_DEC: | 88 | case AMDGPU_HW_IP_VCN_DEC: |
| 94 | *out_ring = &adev->vcn.ring_dec; | 89 | *out_ring = &adev->vcn.ring_dec; |
