Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / radeon_pm.c

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index a3d25f419853866fa8dc82c37844557d12d97209..95f8b3a3c43d993ee6eac9ea3a713b5aa35d3935 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -335,6 +335,7 @@ static ssize_t radeon_get_pm_profile(struct device *dev,
        return snprintf(buf, PAGE_SIZE, "%s\n",
                        (cp == PM_PROFILE_AUTO) ? "auto" :
                        (cp == PM_PROFILE_LOW) ? "low" :
        return snprintf(buf, PAGE_SIZE, "%s\n",
                        (cp == PM_PROFILE_AUTO) ? "auto" :
                        (cp == PM_PROFILE_LOW) ? "low" :

+                       (cp == PM_PROFILE_MID) ? "mid" :

                        (cp == PM_PROFILE_HIGH) ? "high" : "default");
 }
 
                        (cp == PM_PROFILE_HIGH) ? "high" : "default");
 }