Skip to contentSkip to conversation

drm/amdgpu/vcn: use amdgpu_ring_test_helper instead of

PATCH In review Liu, Leo 4 participants 5 messages Oct 1, 2019 – Oct 2, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Liu, Leo

author
#0 lore raw

PATCH 1/2 drm/amdgpu/vcn: use amdgpu_ring_test_helper instead of

amdgpu_ring_test_ring, so it will determine whether the ring is ready

Cc Gustavo A. R. Silva <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c |  1 -
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 21 ++++++---------------
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 18 ++++++------------
 3 files changed, 12 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0 -1
index 93b3500e522b..b4f84a820a44 100644
@@ -202,7 +202,6 @@ static int vcn_v1_0_hw_init(void *handle)
 
 	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
 		r = amdgpu_ring_test_helper(ring);
 		if (r)
 			goto done;
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +6 -15
index 4628fd10a9ec..38f787a560cb 100644
@@ -247,30 +247,21 @@ static int vcn_v2_0_hw_init(void *handle)
 	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
 					     ring->doorbell_index, 0);
 
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
 		goto done;
-	}
 
 	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
 			goto done;
-		}
 	}
 
 	ring = &adev->vcn.inst->ring_jpeg;
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
 		goto done;
-	}
 
 done:
 	if (!r)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +6 -12
index bf8626e15b09..cc194444363f 100644
@@ -258,29 +258,23 @@ static int vcn_v2_5_hw_init(void *handle)
 		adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
 						     ring->doorbell_index, j);
 
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
 			goto done;
-		}
 
 		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 			ring = &adev->vcn.inst[j].ring_enc[i];
 			ring->sched.ready = false;
 			continue;
-			r = amdgpu_ring_test_ring(ring);
-			if (r) {
-				ring->sched.ready = false;
+			r = amdgpu_ring_test_helper(ring);
+			if (r)
 				goto done;
-			}
 		}
 
 		ring = &adev->vcn.inst[j].ring_jpeg;
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
 			goto done;
-		}
 	}
 done:
 	if (!r)
Signature · 6 lines
2.20.1

_______________________________________________
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): [email protected]

author
#2 lore raw

PATCH 2/2 drm/amdgpu: add a comment to VCN 2.5 encode ring

---
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +1 -0
index cc194444363f..0d5c95d73b63 100644
@@ -264,6 +264,7 @@ static int vcn_v2_5_hw_init(void *handle)
 
 		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 			ring = &adev->vcn.inst[j].ring_enc[i];
+			/* disable encode rings till the robustness of the FW */
 			ring->sched.ready = false;
 			continue;
 			r = amdgpu_ring_test_helper(ring);
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by
#3 lore raw
In reply to a message not in the archive

Am 02.10.19 um 00:17 schrieb Liu, Leo:

Quoted 4 lines

amdgpu_ring_test_ring, so it will determine whether the ring is ready

Cc Gustavo A. R. Silva <[email protected]>
Quoted 89 lines
---
  drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c |  1 -
  drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 21 ++++++---------------
  drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 18 ++++++------------
  3 files changed, 12 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0 -1
index 93b3500e522b..b4f84a820a44 100644
@@ -202,7 +202,6 @@ static int vcn_v1_0_hw_init(void *handle)
 
  	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
  		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
  		r = amdgpu_ring_test_helper(ring);
  		if (r)
  			goto done;
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +6 -15
index 4628fd10a9ec..38f787a560cb 100644
@@ -247,30 +247,21 @@ static int vcn_v2_0_hw_init(void *handle)
  	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
  					     ring->doorbell_index, 0);
 
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
  		goto done;
-	}
 
  	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
  		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
  			goto done;
-		}
  	}
 
  	ring = &adev->vcn.inst->ring_jpeg;
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
  		goto done;
-	}
 
  done:
  	if (!r)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +4 -8
index bf8626e15b09..cc194444363f 100644
@@ -258,29 +258,23 @@ static int vcn_v2_5_hw_init(void *handle)
  		adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
  						     ring->doorbell_index, j);
 
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
  			goto done;
-		}
 
  		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
  			ring = &adev->vcn.inst[j].ring_enc[i];
  			ring->sched.ready = false;
  			continue;
-			r = amdgpu_ring_test_ring(ring);
-			if (r) {
-				ring->sched.ready = false;
+			r = amdgpu_ring_test_helper(ring);
+			if (r)
  				goto done;
-			}
  		}
 
  		ring = &adev->vcn.inst[j].ring_jpeg;

drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static int vcn_v2_5_hw_init(void *handle) · line 280

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2 -4
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
  			goto done;
-		}
  	}
  done:
  	if (!r)

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

Reviewed-by
#4 lore raw
In reply to a message not in the archive
Quoted 93 lines · Leo

amdgpu_ring_test_ring, so it will determine whether the ring is ready

Cc Gustavo A. R. Silva <[email protected]>
---
  drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c |  1 -
  drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 21 ++++++---------------
  drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 18 ++++++------------
  3 files changed, 12 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0 -1
index 93b3500e522b..b4f84a820a44 100644
@@ -202,7 +202,6 @@ static int vcn_v1_0_hw_init(void *handle)
 
  	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
  		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
  		r = amdgpu_ring_test_helper(ring);
  		if (r)
  			goto done;
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +6 -15
index 4628fd10a9ec..38f787a560cb 100644
@@ -247,30 +247,21 @@ static int vcn_v2_0_hw_init(void *handle)
  	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
  					     ring->doorbell_index, 0);
 
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
  		goto done;
-	}
 
  	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
  		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
  			goto done;
-		}
  	}
 
  	ring = &adev->vcn.inst->ring_jpeg;
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
  		goto done;
-	}
 
  done:
  	if (!r)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +4 -8
index bf8626e15b09..cc194444363f 100644
@@ -258,29 +258,23 @@ static int vcn_v2_5_hw_init(void *handle)
  		adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
  						     ring->doorbell_index, j);
 
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
  			goto done;
-		}
 
  		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
  			ring = &adev->vcn.inst[j].ring_enc[i];
  			ring->sched.ready = false;
  			continue;
-			r = amdgpu_ring_test_ring(ring);
-			if (r) {
-				ring->sched.ready = false;
+			r = amdgpu_ring_test_helper(ring);
+			if (r)
  				goto done;
-			}
  		}
 
  		ring = &adev->vcn.inst[j].ring_jpeg;

drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static int vcn_v2_5_hw_init(void *handle) · line 280

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2 -4
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
  			goto done;
-		}
  	}
  done:
  	if (!r)

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

#5 lore raw
In reply to a message not in the archive
Quoted 4 lines · Leo

amdgpu_ring_test_ring, so it will determine whether the ring is ready

Cc Gustavo A. R. Silva <[email protected]>
Quoted 90 lines
---
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c |  1 -
 drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 21 ++++++---------------
 drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 18 ++++++------------
 3 files changed, 12 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +0 -1
index 93b3500e522b..b4f84a820a44 100644
@@ -202,7 +202,6 @@ static int vcn_v1_0_hw_init(void *handle)
 
 	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
 		r = amdgpu_ring_test_helper(ring);
 		if (r)
 			goto done;
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +6 -15
index 4628fd10a9ec..38f787a560cb 100644
@@ -247,30 +247,21 @@ static int vcn_v2_0_hw_init(void *handle)
 	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
 					     ring->doorbell_index, 0);
 
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
 		goto done;
-	}
 
 	for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 		ring = &adev->vcn.inst->ring_enc[i];
-		ring->sched.ready = true;
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
 			goto done;
-		}
 	}
 
 	ring = &adev->vcn.inst->ring_jpeg;
-	ring->sched.ready = true;
-	r = amdgpu_ring_test_ring(ring);
-	if (r) {
-		ring->sched.ready = false;
+	r = amdgpu_ring_test_helper(ring);
+	if (r)
 		goto done;
-	}
 
 done:
 	if (!r)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +4 -8
index bf8626e15b09..cc194444363f 100644
@@ -258,29 +258,23 @@ static int vcn_v2_5_hw_init(void *handle)
 		adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
 						     ring->doorbell_index, j);
 
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
 			goto done;
-		}
 
 		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
 			ring = &adev->vcn.inst[j].ring_enc[i];
 			ring->sched.ready = false;
 			continue;
-			r = amdgpu_ring_test_ring(ring);
-			if (r) {
-				ring->sched.ready = false;
+			r = amdgpu_ring_test_helper(ring);
+			if (r)
 				goto done;
-			}
 		}
 
 		ring = &adev->vcn.inst[j].ring_jpeg;

drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c static int vcn_v2_5_hw_init(void *handle) · line 280

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2 -4
-		r = amdgpu_ring_test_ring(ring);
-		if (r) {
-			ring->sched.ready = false;
+		r = amdgpu_ring_test_helper(ring);
+		if (r)
 			goto done;
-		}
 	}
 done:
 	if (!r)

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