Commit 9a7841e9 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Daniel Vetter
Browse files

drm/amdgpu: 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-6-git-send-email-gustavo@padovan.org
parent ceb74152

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2719,13 +2719,13 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		amdgpu_irq_update(adev, &adev->crtc_irq, type);

		amdgpu_irq_update(adev, &adev->pageflip_irq, type);

		drm_vblank_on(dev, amdgpu_crtc->crtc_id);

		drm_crtc_vblank_on(crtc);

		dce_v10_0_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		drm_vblank_off(dev, amdgpu_crtc->crtc_id);

		drm_crtc_vblank_off(crtc);

		if (amdgpu_crtc->enabled) {

			dce_v10_0_vga_enable(crtc, true);

			amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2730,13 +2730,13 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		amdgpu_irq_update(adev, &adev->crtc_irq, type);

		amdgpu_irq_update(adev, &adev->pageflip_irq, type);

		drm_vblank_on(dev, amdgpu_crtc->crtc_id);

		drm_crtc_vblank_on(crtc);

		dce_v11_0_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		drm_vblank_off(dev, amdgpu_crtc->crtc_id);

		drm_crtc_vblank_off(crtc);

		if (amdgpu_crtc->enabled) {

			dce_v11_0_vga_enable(crtc, true);

			amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2626,13 +2626,13 @@ static void dce_v8_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		amdgpu_irq_update(adev, &adev->crtc_irq, type);

		amdgpu_irq_update(adev, &adev->pageflip_irq, type);

		drm_vblank_on(dev, amdgpu_crtc->crtc_id);

		drm_crtc_vblank_on(crtc);

		dce_v8_0_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		drm_vblank_off(dev, amdgpu_crtc->crtc_id);

		drm_crtc_vblank_off(crtc);

		if (amdgpu_crtc->enabled) {

			dce_v8_0_vga_enable(crtc, true);

			amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE