diff options
| author | Dave Airlie | 2016-07-02 07:48:33 +0200 |
|---|---|---|
| committer | Dave Airlie | 2016-07-02 07:48:33 +0200 |
| commit | 40793e85d2f1088e1067f1ddeb63f4dd2336f198 (patch) | |
| tree | 01b9efbec24894b89b255e0d6305cb01b5dc4cb0 /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
| parent | Merge tag 'acpi-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| parent | drm/amd/powerplay: workaround for UVD clock issue (diff) | |
| download | kernel-qcow2-linux-40793e85d2f1088e1067f1ddeb63f4dd2336f198.tar.gz kernel-qcow2-linux-40793e85d2f1088e1067f1ddeb63f4dd2336f198.tar.xz kernel-qcow2-linux-40793e85d2f1088e1067f1ddeb63f4dd2336f198.zip | |
Merge branch 'drm-fixes-4.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Just a few more late fixes for Polaris cards.
* 'drm-fixes-4.7' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/powerplay: workaround for UVD clock issue
drm/amdgpu: add ACLK_CNTL setting for polaris10
drm/amd/powerplay: fix issue uvd dpm can't enabled on Polaris11.
drm/amd/powerplay: Workaround for Memory EDC Error on Polaris10.
drm/amd/powerplay: Update CKS on/ CKS off voltage offset calculation
drm/amd/powerplay: disable FFC.
drm/amd/powerplay: add some definition for FFC feature on polaris.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index e19520c4b4b6..d9c88d13f8db 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -1106,6 +1106,10 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work) if (fences == 0 && handles == 0) { if (adev->pm.dpm_enabled) { amdgpu_dpm_enable_uvd(adev, false); + /* just work around for uvd clock remain high even + * when uvd dpm disabled on Polaris10 */ + if (adev->asic_type == CHIP_POLARIS10) + amdgpu_asic_set_uvd_clocks(adev, 0, 0); } else { amdgpu_asic_set_uvd_clocks(adev, 0, 0); } |