Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60629c4d authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Daniel Vetter
Browse files

drm/amdgpu: use drm_crtc_vblank_{get,put}() 



Replace the legacy drm_vblank_{get,put}() with the new helper functions.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465224105-21485-8-git-send-email-gustavo@padovan.org
parent a288c1ea

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

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, 


	work->base = base;



	r = drm_vblank_get(crtc->dev, amdgpu_crtc->crtc_id);

	r = drm_crtc_vblank_get(crtc);

	if (r) {

		DRM_ERROR("failed to get vblank before flip\n");

		goto pflip_cleanup;
@@ -268,7 +268,7 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, 
	return 0;



vblank_cleanup:

	drm_vblank_put(crtc->dev, amdgpu_crtc->crtc_id);

	drm_crtc_vblank_put(&amdgpu_crtc->base);



pflip_cleanup:

	if (unlikely(amdgpu_bo_reserve(new_rbo, false) != 0)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -3372,7 +3372,7 @@ static int dce_v10_0_pageflip_irq(struct amdgpu_device *adev, 


	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);



	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);

	drm_crtc_vblank_put(&amdgpu_crtc->base);

	schedule_work(&works->unpin_work);



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -3433,7 +3433,7 @@ static int dce_v11_0_pageflip_irq(struct amdgpu_device *adev, 


	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);



	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);

	drm_crtc_vblank_put(&amdgpu_crtc->base);

	schedule_work(&works->unpin_work);



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -3376,7 +3376,7 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev, 


	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);



	drm_vblank_put(adev->ddev, amdgpu_crtc->crtc_id);

	drm_crtc_vblank_put(&amdgpu_crtc->base);

	schedule_work(&works->unpin_work);



	return 0;