summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2016-03-16 09:48:18 +0300
committerAlex Deucher <alexander.deucher@amd.com>2016-05-02 22:22:18 +0300
commit976accc1148becb5a0560236c53e2f68cb2d5494 (patch)
treeafd30d74871c01c2f4d73c2e5114aa44b73761ed /drivers/gpu/drm/amd
parentcb48a13ef994fcc4d1813c5c3241d4e4496c2199 (diff)
downloadlinux-976accc1148becb5a0560236c53e2f68cb2d5494.tar.xz
drm/amdgpu: No need to stop hw init although vce's state was not true.
This is not a fatal error. v2: add comment why ignore the error here. Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vce_v2_0.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
index fda89ec1d33b..4440973f9f53 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
@@ -240,7 +240,8 @@ static int vce_v2_0_hw_init(void *handle)
r = vce_v2_0_start(adev);
if (r)
- return r;
+/* this error mean vcpu not in running state, so just skip ring test, not stop driver initialize */
+ return 0;
ring = &adev->vce.ring[0];
ring->ready = true;