diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 2e216e2ea78c..e91763d5d800 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
| @@ -276,14 +276,14 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
| 276 | atombios_enable_crtc_memreq(crtc, ATOM_ENABLE); | 276 | atombios_enable_crtc_memreq(crtc, ATOM_ENABLE); |
| 277 | atombios_blank_crtc(crtc, ATOM_DISABLE); | 277 | atombios_blank_crtc(crtc, ATOM_DISABLE); |
| 278 | if (dev->num_crtcs > radeon_crtc->crtc_id) | 278 | if (dev->num_crtcs > radeon_crtc->crtc_id) |
| 279 | drm_vblank_on(dev, radeon_crtc->crtc_id); | 279 | drm_crtc_vblank_on(crtc); |
| 280 | radeon_crtc_load_lut(crtc); | 280 | radeon_crtc_load_lut(crtc); |
| 281 | break; | 281 | break; |
| 282 | case DRM_MODE_DPMS_STANDBY: | 282 | case DRM_MODE_DPMS_STANDBY: |
| 283 | case DRM_MODE_DPMS_SUSPEND: | 283 | case DRM_MODE_DPMS_SUSPEND: |
| 284 | case DRM_MODE_DPMS_OFF: | 284 | case DRM_MODE_DPMS_OFF: |
| 285 | if (dev->num_crtcs > radeon_crtc->crtc_id) | 285 | if (dev->num_crtcs > radeon_crtc->crtc_id) |
| 286 | drm_vblank_off(dev, radeon_crtc->crtc_id); | 286 | drm_crtc_vblank_off(crtc); |
| 287 | if (radeon_crtc->enabled) | 287 | if (radeon_crtc->enabled) |
| 288 | atombios_blank_crtc(crtc, ATOM_ENABLE); | 288 | atombios_blank_crtc(crtc, ATOM_ENABLE); |
| 289 | if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev)) | 289 | if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev)) |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c index 478d4099b0d0..d0de4022fff9 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | |||
| @@ -332,14 +332,14 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) | |||
| 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 | if (dev->num_crtcs > radeon_crtc->crtc_id) |
| 335 | drm_vblank_on(dev, radeon_crtc->crtc_id); | 335 | drm_crtc_vblank_on(crtc); |
| 336 | radeon_crtc_load_lut(crtc); | 336 | radeon_crtc_load_lut(crtc); |
| 337 | break; | 337 | break; |
| 338 | case DRM_MODE_DPMS_STANDBY: | 338 | case DRM_MODE_DPMS_STANDBY: |
| 339 | case DRM_MODE_DPMS_SUSPEND: | 339 | case DRM_MODE_DPMS_SUSPEND: |
| 340 | case DRM_MODE_DPMS_OFF: | 340 | case DRM_MODE_DPMS_OFF: |
| 341 | if (dev->num_crtcs > radeon_crtc->crtc_id) | 341 | if (dev->num_crtcs > radeon_crtc->crtc_id) |
| 342 | drm_vblank_off(dev, radeon_crtc->crtc_id); | 342 | drm_crtc_vblank_off(crtc); |
| 343 | if (radeon_crtc->crtc_id) | 343 | if (radeon_crtc->crtc_id) |
| 344 | WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask)); | 344 | WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask)); |
| 345 | else { | 345 | else { |
