Re: [PATCH 1/3] drm/amd/amdgpu: VCE ring test fail during S4 on CI

2016-08-30 Thread Christian König

Am 30.08.2016 um 03:21 schrieb jimqu:

Set up the VCE clock no matter dpm is enabled or not.


NAK, if DPM or powerplay is enabled you are totally confusing it by 
messing with the clocks manually.


Christian.



Change-Id: I68e315f8b62c6e3a8636bc5e14036ecc11d980b4
Signed-off-by: JimQu 
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 ++-
  1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 9b71d6c..50993df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -812,11 +812,13 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
unsigned i;
int r;
  
+	amdgpu_asic_set_vce_clocks(adev, 53300, 4);

+
r = amdgpu_ring_alloc(ring, 16);
if (r) {
DRM_ERROR("amdgpu: vce failed to lock ring %d (%d).\n",
  ring->idx, r);
-   return r;
+   goto done;
}
amdgpu_ring_write(ring, VCE_CMD_END);
amdgpu_ring_commit(ring);
@@ -836,6 +838,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
r = -ETIMEDOUT;
}
  
+done:

+   amdgpu_asic_set_vce_clocks(adev, 0, 0);
+
return r;
  }
  



___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


[PATCH 1/3] drm/amd/amdgpu: VCE ring test fail during S4 on CI

2016-08-29 Thread jimqu
Set up the VCE clock no matter dpm is enabled or not.

Change-Id: I68e315f8b62c6e3a8636bc5e14036ecc11d980b4
Signed-off-by: JimQu 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 9b71d6c..50993df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -812,11 +812,13 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
unsigned i;
int r;
 
+   amdgpu_asic_set_vce_clocks(adev, 53300, 4);
+
r = amdgpu_ring_alloc(ring, 16);
if (r) {
DRM_ERROR("amdgpu: vce failed to lock ring %d (%d).\n",
  ring->idx, r);
-   return r;
+   goto done;
}
amdgpu_ring_write(ring, VCE_CMD_END);
amdgpu_ring_commit(ring);
@@ -836,6 +838,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
r = -ETIMEDOUT;
}
 
+done:
+   amdgpu_asic_set_vce_clocks(adev, 0, 0);
+
return r;
 }
 
-- 
1.9.1

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx