| 252,6 → 252,8 |
|---|
| radeon_crtc->enabled = true; |
| /* adjust pm to dpms changes BEFORE enabling crtcs */ |
| radeon_pm_compute_clocks(rdev); |
| if (ASIC_IS_DCE6(rdev) && !radeon_crtc->in_mode_set) |
| atombios_powergate_crtc(crtc, ATOM_DISABLE); |
| atombios_enable_crtc(crtc, ATOM_ENABLE); |
| if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev)) |
| atombios_enable_crtc_memreq(crtc, ATOM_ENABLE); |
| 269,6 → 271,8 |
|---|
| atombios_enable_crtc_memreq(crtc, ATOM_DISABLE); |
| atombios_enable_crtc(crtc, ATOM_DISABLE); |
| radeon_crtc->enabled = false; |
| if (ASIC_IS_DCE6(rdev) && !radeon_crtc->in_mode_set) |
| atombios_powergate_crtc(crtc, ATOM_ENABLE); |
| /* adjust pm to dpms changes AFTER disabling crtcs */ |
| radeon_pm_compute_clocks(rdev); |
| break; |
| 557,9 → 561,6 |
|---|
| /* use frac fb div on APUs */ |
| if (ASIC_IS_DCE41(rdev) || ASIC_IS_DCE61(rdev)) |
| radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV; |
| /* use frac fb div on RS780/RS880 */ |
| if ((rdev->family == CHIP_RS780) || (rdev->family == CHIP_RS880)) |
| radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV; |
| if (ASIC_IS_DCE32(rdev) && mode->clock > 165000) |
| radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV; |
| } else { |
| 1811,9 → 1812,12 |
|---|
| |
| static void atombios_crtc_prepare(struct drm_crtc *crtc) |
| { |
| struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); |
| struct drm_device *dev = crtc->dev; |
| struct radeon_device *rdev = dev->dev_private; |
| |
| radeon_crtc->in_mode_set = true; |
| |
| /* disable crtc pair power gating before programming */ |
| if (ASIC_IS_DCE6(rdev)) |
| atombios_powergate_crtc(crtc, ATOM_DISABLE); |
| 1824,8 → 1828,11 |
|---|
| |
| static void atombios_crtc_commit(struct drm_crtc *crtc) |
| { |
| struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); |
| |
| atombios_crtc_dpms(crtc, DRM_MODE_DPMS_ON); |
| atombios_lock_crtc(crtc, ATOM_DISABLE); |
| radeon_crtc->in_mode_set = false; |
| } |
| |
| static void atombios_crtc_disable(struct drm_crtc *crtc) |
| 1837,8 → 1844,6 |
|---|
| int i; |
| |
| atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); |
| if (ASIC_IS_DCE6(rdev)) |
| atombios_powergate_crtc(crtc, ATOM_ENABLE); |
| |
| for (i = 0; i < rdev->num_crtc; i++) { |
| if (rdev->mode_info.crtcs[i] && |