diff options
| author | pding | 2017-11-06 04:21:55 +0100 |
|---|---|---|
| committer | Alex Deucher | 2017-12-04 22:41:44 +0100 |
| commit | c6332b97fa77bafba2e4c68050090c08c21bff35 (patch) | |
| tree | cd16eb59af432b3f4ea456ea52e9d8bd83de9388 | |
| parent | drm/amdkfd: initialise kfd inside amdgpu_device_init (diff) | |
| download | kernel-qcow2-linux-c6332b97fa77bafba2e4c68050090c08c21bff35.tar.gz kernel-qcow2-linux-c6332b97fa77bafba2e4c68050090c08c21bff35.tar.xz kernel-qcow2-linux-c6332b97fa77bafba2e4c68050090c08c21bff35.zip | |
drm/amdgpu: release exclusive mode after hw_init
Signed-off-by: pding <Pixel.Ding@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 |
2 files changed, 4 insertions, 3 deletions
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 */ |