Commit 5c9ac115 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Daniel Vetter
Browse files

drm/radeon: use drm_crtc_vblank_{on,off}() 



Replace the legacy drm_vblank_{on,off}() with the new helper functions.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465308482-15104-8-git-send-email-gustavo@padovan.org
parent 9a7841e9

drivers/gpu/drm/radeon/atombios_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -276,14 +276,14 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode) 
			atombios_enable_crtc_memreq(crtc, ATOM_ENABLE);

		atombios_blank_crtc(crtc, ATOM_DISABLE);

		if (dev->num_crtcs > radeon_crtc->crtc_id)

			drm_vblank_on(dev, radeon_crtc->crtc_id);

			drm_crtc_vblank_on(crtc);

		radeon_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		if (dev->num_crtcs > radeon_crtc->crtc_id)

			drm_vblank_off(dev, radeon_crtc->crtc_id);

			drm_crtc_vblank_off(crtc);

		if (radeon_crtc->enabled)

			atombios_blank_crtc(crtc, ATOM_ENABLE);

		if (ASIC_IS_DCE3(rdev) && !ASIC_IS_DCE6(rdev))

drivers/gpu/drm/radeon/radeon_legacy_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -332,14 +332,14 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) 
			WREG32_P(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl, ~(mask | crtc_ext_cntl));

		}

		if (dev->num_crtcs > radeon_crtc->crtc_id)

			drm_vblank_on(dev, radeon_crtc->crtc_id);

			drm_crtc_vblank_on(crtc);

		radeon_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		if (dev->num_crtcs > radeon_crtc->crtc_id)

			drm_vblank_off(dev, radeon_crtc->crtc_id);

			drm_crtc_vblank_off(crtc);

		if (radeon_crtc->crtc_id)

			WREG32_P(RADEON_CRTC2_GEN_CNTL, mask, ~(RADEON_CRTC2_EN | mask));

		else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE