diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-03-28 10:44:28 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-06-27 19:40:05 -0400 |
commit | fa4b5471bd6231d293a2de9ad016e39eb2c9c70e (patch) | |
tree | df0e718c364b50457e1b72e2930f3be5b8e39c19 /drivers/gpu/drm/radeon/rv770_dpm.c | |
parent | a9e61410921bcc1aa8f594ffa6301d5baba90f3b (diff) |
drm/radeon/dpm: add dpm_enable failure output (7xx-ni)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770_dpm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770_dpm.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index 0c9a495aba87..cdf823d9fae6 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c | |||
@@ -1886,8 +1886,10 @@ int rv770_dpm_enable(struct radeon_device *rdev) | |||
1886 | if (pi->voltage_control) { | 1886 | if (pi->voltage_control) { |
1887 | rv770_enable_voltage_control(rdev, true); | 1887 | rv770_enable_voltage_control(rdev, true); |
1888 | ret = rv770_construct_vddc_table(rdev); | 1888 | ret = rv770_construct_vddc_table(rdev); |
1889 | if (ret) | 1889 | if (ret) { |
1890 | DRM_ERROR("rv770_construct_vddc_table failed\n"); | ||
1890 | return ret; | 1891 | return ret; |
1892 | } | ||
1891 | } | 1893 | } |
1892 | 1894 | ||
1893 | if (pi->dcodt) | 1895 | if (pi->dcodt) |
@@ -1895,8 +1897,10 @@ int rv770_dpm_enable(struct radeon_device *rdev) | |||
1895 | 1897 | ||
1896 | if (pi->mvdd_control) { | 1898 | if (pi->mvdd_control) { |
1897 | ret = rv770_get_mvdd_configuration(rdev); | 1899 | ret = rv770_get_mvdd_configuration(rdev); |
1898 | if (ret) | 1900 | if (ret) { |
1901 | DRM_ERROR("rv770_get_mvdd_configuration failed\n"); | ||
1899 | return ret; | 1902 | return ret; |
1903 | } | ||
1900 | } | 1904 | } |
1901 | 1905 | ||
1902 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_BACKBIAS) | 1906 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_BACKBIAS) |
@@ -1921,12 +1925,15 @@ int rv770_dpm_enable(struct radeon_device *rdev) | |||
1921 | rv770_enable_dynamic_pcie_gen2(rdev, true); | 1925 | rv770_enable_dynamic_pcie_gen2(rdev, true); |
1922 | 1926 | ||
1923 | ret = rv770_upload_firmware(rdev); | 1927 | ret = rv770_upload_firmware(rdev); |
1924 | if (ret) | 1928 | if (ret) { |
1929 | DRM_ERROR("rv770_upload_firmware failed\n"); | ||
1925 | return ret; | 1930 | return ret; |
1926 | 1931 | } | |
1927 | ret = rv770_init_smc_table(rdev, boot_ps); | 1932 | ret = rv770_init_smc_table(rdev, boot_ps); |
1928 | if (ret) | 1933 | if (ret) { |
1934 | DRM_ERROR("rv770_init_smc_table failed\n"); | ||
1929 | return ret; | 1935 | return ret; |
1936 | } | ||
1930 | 1937 | ||
1931 | rv770_program_response_times(rdev); | 1938 | rv770_program_response_times(rdev); |
1932 | r7xx_start_smc(rdev); | 1939 | r7xx_start_smc(rdev); |