diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/cypress_dpm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/cypress_dpm.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 9bf7ff7907b2..f90e5498785c 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c | |||
@@ -1813,14 +1813,18 @@ int cypress_dpm_enable(struct radeon_device *rdev) | |||
1813 | if (pi->voltage_control) { | 1813 | if (pi->voltage_control) { |
1814 | rv770_enable_voltage_control(rdev, true); | 1814 | rv770_enable_voltage_control(rdev, true); |
1815 | ret = cypress_construct_voltage_tables(rdev); | 1815 | ret = cypress_construct_voltage_tables(rdev); |
1816 | if (ret) | 1816 | if (ret) { |
1817 | DRM_ERROR("cypress_construct_voltage_tables failed\n"); | ||
1817 | return ret; | 1818 | return ret; |
1819 | } | ||
1818 | } | 1820 | } |
1819 | 1821 | ||
1820 | if (pi->mvdd_control) { | 1822 | if (pi->mvdd_control) { |
1821 | ret = cypress_get_mvdd_configuration(rdev); | 1823 | ret = cypress_get_mvdd_configuration(rdev); |
1822 | if (ret) | 1824 | if (ret) { |
1825 | DRM_ERROR("cypress_get_mvdd_configuration failed\n"); | ||
1823 | return ret; | 1826 | return ret; |
1827 | } | ||
1824 | } | 1828 | } |
1825 | 1829 | ||
1826 | if (eg_pi->dynamic_ac_timing) { | 1830 | if (eg_pi->dynamic_ac_timing) { |
@@ -1854,21 +1858,27 @@ int cypress_dpm_enable(struct radeon_device *rdev) | |||
1854 | cypress_enable_dynamic_pcie_gen2(rdev, true); | 1858 | cypress_enable_dynamic_pcie_gen2(rdev, true); |
1855 | 1859 | ||
1856 | ret = rv770_upload_firmware(rdev); | 1860 | ret = rv770_upload_firmware(rdev); |
1857 | if (ret) | 1861 | if (ret) { |
1862 | DRM_ERROR("rv770_upload_firmware failed\n"); | ||
1858 | return ret; | 1863 | return ret; |
1864 | } | ||
1859 | 1865 | ||
1860 | ret = cypress_get_table_locations(rdev); | 1866 | ret = cypress_get_table_locations(rdev); |
1861 | if (ret) | 1867 | if (ret) { |
1868 | DRM_ERROR("cypress_get_table_locations failed\n"); | ||
1862 | return ret; | 1869 | return ret; |
1863 | 1870 | } | |
1864 | ret = cypress_init_smc_table(rdev, boot_ps); | 1871 | ret = cypress_init_smc_table(rdev, boot_ps); |
1865 | if (ret) | 1872 | if (ret) { |
1873 | DRM_ERROR("cypress_init_smc_table failed\n"); | ||
1866 | return ret; | 1874 | return ret; |
1867 | 1875 | } | |
1868 | if (eg_pi->dynamic_ac_timing) { | 1876 | if (eg_pi->dynamic_ac_timing) { |
1869 | ret = cypress_populate_mc_reg_table(rdev, boot_ps); | 1877 | ret = cypress_populate_mc_reg_table(rdev, boot_ps); |
1870 | if (ret) | 1878 | if (ret) { |
1879 | DRM_ERROR("cypress_populate_mc_reg_table failed\n"); | ||
1871 | return ret; | 1880 | return ret; |
1881 | } | ||
1872 | } | 1882 | } |
1873 | 1883 | ||
1874 | cypress_program_response_times(rdev); | 1884 | cypress_program_response_times(rdev); |
@@ -1876,9 +1886,10 @@ int cypress_dpm_enable(struct radeon_device *rdev) | |||
1876 | r7xx_start_smc(rdev); | 1886 | r7xx_start_smc(rdev); |
1877 | 1887 | ||
1878 | ret = cypress_notify_smc_display_change(rdev, false); | 1888 | ret = cypress_notify_smc_display_change(rdev, false); |
1879 | if (ret) | 1889 | if (ret) { |
1890 | DRM_ERROR("cypress_notify_smc_display_change failed\n"); | ||
1880 | return ret; | 1891 | return ret; |
1881 | 1892 | } | |
1882 | cypress_enable_sclk_control(rdev, true); | 1893 | cypress_enable_sclk_control(rdev, true); |
1883 | 1894 | ||
1884 | if (eg_pi->memory_transition) | 1895 | if (eg_pi->memory_transition) |