leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: Skip uvd and vce ring test for SRIOV

Browse Source 
Since rptr would not be accessed on later secure asics in sriov, remove
the ring test.

Signed-off-by: Frank Min <Frank.Min@amd.com>
Signed-off-by: Xiangliang.Yu <Xiangliang.Yu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Frank Min 2017-06-12 11:02:09 +08:00 committed by Alex Deucher
parent 088c69aad4
commit a1b9022a3b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
View File

@ -937,9 +937,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
unsigned i; unsigned i;
int r, timeout = adev->usec_timeout; int r, timeout = adev->usec_timeout;
/* workaround VCE ring test slow issue for sriov*/ /* skip ring test for sriov*/
if (amdgpu_sriov_vf(adev)) if (amdgpu_sriov_vf(adev))
timeout *= 10; return 0;
r = amdgpu_ring_alloc(ring, 16); r = amdgpu_ring_alloc(ring, 16);
if (r) { if (r) {

3
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
View File

@ -165,6 +165,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
unsigned i; unsigned i;
int r; int r;
if (amdgpu_sriov_vf(adev))
return 0;
r = amdgpu_ring_alloc(ring, 16); r = amdgpu_ring_alloc(ring, 16);
if (r) { if (r) {
DRM_ERROR("amdgpu: uvd enc failed to lock ring %d (%d).\n", DRM_ERROR("amdgpu: uvd enc failed to lock ring %d (%d).\n",