From: Rex Zhu Date: Wed, 16 Mar 2016 06:48:18 +0000 (+0800) Subject: drm/amdgpu: No need to stop hw init although vce's state was not true. X-Git-Tag: v4.7-rc1~77^2~23^2~150 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=976accc1148becb5a0560236c53e2f68cb2d5494;p=karo-tx-linux.git 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 Reviewed-by: Alex Deucher Reviewed-by: Christian König Signed-off-by: Alex Deucher --- 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;