diff options
| author | Christian König <christian.koenig@amd.com> | 2014-01-10 16:05:05 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-01-20 18:05:12 +0100 |
| commit | 8158eb9e32c4c98c7dd152207fd70f747ef81a9a (patch) | |
| tree | b1936c91bbfa7f56f92e6c2e8e1156f1a75ed98a /drivers/gpu/drm/radeon/radeon_pm.c | |
| parent | Revert "drm/radeon: disable CIK CP semaphores for now" (diff) | |
| download | linux-8158eb9e32c4c98c7dd152207fd70f747ef81a9a.tar.xz linux-8158eb9e32c4c98c7dd152207fd70f747ef81a9a.zip | |
drm/radeon: don't power gate paused UVD streams
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 0b24c4c7dcf9..63c50493da56 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -924,6 +924,10 @@ void radeon_dpm_enable_uvd(struct radeon_device *rdev, bool enable) if (rdev->asic->dpm.powergate_uvd) { mutex_lock(&rdev->pm.mutex); + /* don't powergate anything if we + have active but pause streams */ + enable |= rdev->pm.dpm.sd > 0; + enable |= rdev->pm.dpm.hd > 0; /* enable/disable UVD */ radeon_dpm_powergate_uvd(rdev, !enable); mutex_unlock(&rdev->pm.mutex); |