From: pding Date: Mon, 6 Nov 2017 03:21:55 +0000 (+0800) Subject: drm/amdgpu: release exclusive mode after hw_init X-Git-Tag: android-x86-8.1-r1~1677^2~33^2~207 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6332b97fa77bafba2e4c68050090c08c21bff35;p=android-x86%2Fkernel.git drm/amdgpu: release exclusive mode after hw_init Signed-off-by: pding Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 6636fa25aaf5..ddb50c48cb06 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1790,6 +1790,10 @@ static int amdgpu_init(struct amdgpu_device *adev) } amdgpu_amdkfd_device_init(adev); + + if (amdgpu_sriov_vf(adev)) + amdgpu_virt_release_full_gpu(adev, true); + return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 252d41d5ff56..9ed1bee0fd64 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -177,9 +177,6 @@ retry_init: pm_runtime_put_autosuspend(dev->dev); } - if (amdgpu_sriov_vf(adev)) - amdgpu_virt_release_full_gpu(adev, true); - out: if (r) { /* balance pm_runtime_get_sync in amdgpu_driver_unload_kms */