diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2017-04-24 13:51:52 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-04-28 17:32:48 -0400 |
| commit | 7ad87b96962a01830b0751d11a389b4039eb4460 (patch) | |
| tree | 5aef728b4657d9ed1c369e7feac6a215ef7a8259 /drivers | |
| parent | d0766e981b36608f9fe9b29985d4cd696099c3f8 (diff) | |
Revert "drm/amd/amdgpu: Set VCE/UVD off during late init"
This leads to hangs on init.
This reverts commit d1aff8ec49c3ece05cee9b6e63d44e96a420b068.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 8aad6f4a5241..75f851bd5b63 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -53,7 +53,6 @@ #include "bif/bif_4_1_d.h" #include <linux/pci.h> #include <linux/firmware.h> -#include "amdgpu_pm.h" static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); @@ -1583,9 +1582,6 @@ static int amdgpu_late_init(struct amdgpu_device *adev) } } - amdgpu_dpm_enable_uvd(adev, false); - amdgpu_dpm_enable_vce(adev, false); - return 0; } |