Skip to contentSkip to conversation

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

PATCH In review Xiangliang.Yu 2 participants 2 messages Jul 25, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

From: Frank Min <[email protected]>

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

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
index b692ad4..c855366 100644
@@ -937,9 +937,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
 	unsigned i;
 	int r, timeout = adev->usec_timeout;
 
-	/* workaround VCE ring test slow issue for sriov*/
+	/* skip ring test for sriov*/
 	if (amdgpu_sriov_vf(adev))
-		timeout *= 10;
+		return 0;
 
 	r = amdgpu_ring_alloc(ring, 16);
 	if (r) {
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +3 -0
index fbf7b412..ab447e8 100644
@@ -165,6 +165,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
 	unsigned i;
 	int r;
 
+	if (amdgpu_sriov_vf(adev))
+		return 0;
+
 	r = amdgpu_ring_alloc(ring, 16);
 	if (r) {
 		DRM_ERROR("amdgpu: uvd enc failed to lock ring %d (%d).\n",
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1500974241-2529-1-git-send-email-Xiangliang.Yu-5C7GfCeVMHo@public.gmane.org

Acked-by
#2 lore raw
Quoted 7 lines · Xiangliang.Yu

From: Frank Min <[email protected]>

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

Quoted 38 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
index b692ad4..c855366 100644
@@ -937,9 +937,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
        unsigned i;
        int r, timeout = adev->usec_timeout;
 
-       /* workaround VCE ring test slow issue for sriov*/
+       /* skip ring test for sriov*/
        if (amdgpu_sriov_vf(adev))
-               timeout *= 10;
+               return 0;
 
        r = amdgpu_ring_alloc(ring, 16);
        if (r) {
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +3 -1
index fbf7b412..ab447e8 100644
@@ -165,6 +165,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
        unsigned i;
        int r;
 
+       if (amdgpu_sriov_vf(adev))
+               return 0;
+
        r = amdgpu_ring_alloc(ring, 16);
        if (r) {
                DRM_ERROR("amdgpu: uvd enc failed to lock ring %d (%d).\n",
--

2.7.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx