Newer asics don't have specific UVD states.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/radeon/radeon_pm.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c 
b/drivers/gpu/drm/radeon/radeon_pm.c
index b72508b..79a03de 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -695,7 +695,10 @@ restart_search:
                        break;
                /* internal states */
                case POWER_STATE_TYPE_INTERNAL_UVD:
-                       return rdev->pm.dpm.uvd_ps;
+                       if (rdev->pm.dpm.uvd_ps)
+                               return rdev->pm.dpm.uvd_ps;
+                       else
+                               break;
                case POWER_STATE_TYPE_INTERNAL_UVD_SD:
                        if (ps->class & ATOM_PPLIB_CLASSIFICATION_SDSTATE)
                                return ps;
@@ -742,7 +745,12 @@ restart_search:
        case POWER_STATE_TYPE_INTERNAL_UVD_HD:
        case POWER_STATE_TYPE_INTERNAL_UVD_HD2:
        case POWER_STATE_TYPE_INTERNAL_UVD_MVC:
-               return rdev->pm.dpm.uvd_ps;
+               if (rdev->pm.dpm.uvd_ps) {
+                       return rdev->pm.dpm.uvd_ps;
+               } else {
+                       dpm_state = POWER_STATE_TYPE_PERFORMANCE;
+                       goto restart_search;
+               }
        case POWER_STATE_TYPE_INTERNAL_THERMAL:
                dpm_state = POWER_STATE_TYPE_INTERNAL_ACPI;
                goto restart_search;
-- 
1.8.3.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to