diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vce_v3_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c index f0656dfb53f3..6a52db6ad8d7 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | |||
@@ -205,8 +205,9 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) | |||
205 | u32 tmp; | 205 | u32 tmp; |
206 | unsigned ret; | 206 | unsigned ret; |
207 | 207 | ||
208 | /* Fiji is single pipe */ | 208 | /* Fiji, Stoney are single pipe */ |
209 | if (adev->asic_type == CHIP_FIJI) { | 209 | if ((adev->asic_type == CHIP_FIJI) || |
210 | (adev->asic_type == CHIP_STONEY)){ | ||
210 | ret = AMDGPU_VCE_HARVEST_VCE1; | 211 | ret = AMDGPU_VCE_HARVEST_VCE1; |
211 | return ret; | 212 | return ret; |
212 | } | 213 | } |
@@ -643,7 +644,6 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_funcs = { | |||
643 | .emit_semaphore = amdgpu_vce_ring_emit_semaphore, | 644 | .emit_semaphore = amdgpu_vce_ring_emit_semaphore, |
644 | .test_ring = amdgpu_vce_ring_test_ring, | 645 | .test_ring = amdgpu_vce_ring_test_ring, |
645 | .test_ib = amdgpu_vce_ring_test_ib, | 646 | .test_ib = amdgpu_vce_ring_test_ib, |
646 | .is_lockup = amdgpu_ring_test_lockup, | ||
647 | .insert_nop = amdgpu_ring_insert_nop, | 647 | .insert_nop = amdgpu_ring_insert_nop, |
648 | }; | 648 | }; |
649 | 649 | ||