Rev 6938 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6938 | Rev 7146 | ||
|---|---|---|---|
| Line 329... | Line 329... | ||
| 329 | else { |
329 | else { |
| 330 | WREG32_P(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_EN, ~(RADEON_CRTC_EN | |
330 | WREG32_P(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_EN, ~(RADEON_CRTC_EN | |
| 331 | RADEON_CRTC_DISP_REQ_EN_B)); |
331 | RADEON_CRTC_DISP_REQ_EN_B)); |
| 332 | WREG32_P(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl, ~(mask | crtc_ext_cntl)); |
332 | WREG32_P(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl, ~(mask | crtc_ext_cntl)); |
| 333 | } |
333 | } |
| - | 334 | if (dev->num_crtcs > radeon_crtc->crtc_id) |
|
| 334 | drm_vblank_post_modeset(dev, radeon_crtc->crtc_id); |
335 | drm_vblank_on(dev, radeon_crtc->crtc_id); |
| 335 | radeon_crtc_load_lut(crtc); |
336 | radeon_crtc_load_lut(crtc); |
| 336 | break; |
337 | break; |
| 337 | case DRM_MODE_DPMS_STANDBY: |
338 | case DRM_MODE_DPMS_STANDBY: |
| 338 | case DRM_MODE_DPMS_SUSPEND: |
339 | case DRM_MODE_DPMS_SUSPEND: |
| 339 | case DRM_MODE_DPMS_OFF: |
340 | case DRM_MODE_DPMS_OFF: |
| - | 341 | if (dev->num_crtcs > radeon_crtc->crtc_id) |
|
| 340 | drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id); |
342 | drm_vblank_off(dev, radeon_crtc->crtc_id); |
| 341 | if (radeon_crtc->crtc_id) |
343 | if (radeon_crtc->crtc_id) |
| 342 | WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask)); |
344 | WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask)); |
| 343 | else { |
345 | else { |
| 344 | WREG32_P(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_DISP_REQ_EN_B, ~(RADEON_CRTC_EN | |
346 | WREG32_P(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_DISP_REQ_EN_B, ~(RADEON_CRTC_EN | |
| 345 | RADEON_CRTC_DISP_REQ_EN_B)); |
347 | RADEON_CRTC_DISP_REQ_EN_B)); |