diff options
author | Tom St Denis <tom.stdenis@amd.com> | 2016-08-09 18:01:55 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:54:05 -0400 |
commit | d1aff8ec49c3ece05cee9b6e63d44e96a420b068 (patch) | |
tree | 14dcd33b0e1d216939653d647f0ef7a4d2023048 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | f917c2ad92c416b05d876f513a9963a6f5ed139d (diff) |
drm/amd/amdgpu: Set VCE/UVD off during late init
Forces VCE/UVD off during late init to ensure they're powered off
correctly during boot.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Samuel Li <Samuel.Li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index c0d12e83d5ed..7f996ac089b4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -51,6 +51,7 @@ | |||
51 | #include "bif/bif_4_1_d.h" | 51 | #include "bif/bif_4_1_d.h" |
52 | #include <linux/pci.h> | 52 | #include <linux/pci.h> |
53 | #include <linux/firmware.h> | 53 | #include <linux/firmware.h> |
54 | #include "amdgpu_pm.h" | ||
54 | 55 | ||
55 | static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); | 56 | static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev); |
56 | static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); | 57 | static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev); |
@@ -1557,6 +1558,9 @@ static int amdgpu_late_init(struct amdgpu_device *adev) | |||
1557 | } | 1558 | } |
1558 | } | 1559 | } |
1559 | 1560 | ||
1561 | amdgpu_dpm_enable_uvd(adev, false); | ||
1562 | amdgpu_dpm_enable_vce(adev, false); | ||
1563 | |||
1560 | return 0; | 1564 | return 0; |
1561 | } | 1565 | } |
1562 | 1566 | ||