[PATCH 2/5] drm/radeon: remove drm_vblank_get|put from pflip handling

[Alex Deucher]

On Tue, May 27, 2014 at 10:49 AM, Christian König
<deathsimple at vodafone.de> wrote:
> From: Christian König <christian.koenig at amd.com>
>
> We activate the VBLANK irq manually anyway, so this is unnecessary.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/radeon/radeon_display.c | 17 -----------------
>  1 file changed, 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
> index beccc4a..d597d08 100644
> --- a/drivers/gpu/drm/radeon/radeon_display.c
> +++ b/drivers/gpu/drm/radeon/radeon_display.c
> @@ -340,7 +340,6 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
>
>         spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
>
> -       drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id);
>         radeon_fence_unref(&work->fence);
>         radeon_irq_kms_pflip_irq_get(rdev, work->crtc_id);
>         schedule_work(&work->work);
> @@ -464,27 +463,11 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
>         /* update crtc fb */
>         crtc->primary->fb = fb;
>
> -       r = drm_vblank_get(dev, radeon_crtc->crtc_id);
> -       if (r) {
> -               DRM_ERROR("failed to get vblank before flip\n");
> -               goto pflip_cleanup1;
> -       }
> -
>         /* set the proper interrupt */
>         radeon_irq_kms_pflip_irq_get(rdev, radeon_crtc->crtc_id);
>
>         return 0;
>
> -pflip_cleanup1:
> -       if (unlikely(radeon_bo_reserve(rbo, false) != 0)) {
> -               DRM_ERROR("failed to reserve new rbo in error path\n");
> -               goto pflip_cleanup;
> -       }
> -       if (unlikely(radeon_bo_unpin(rbo) != 0)) {
> -               DRM_ERROR("failed to unpin new rbo in error path\n");
> -       }
> -       radeon_bo_unreserve(rbo);
> -
>  pflip_cleanup:
>         spin_lock_irqsave(&dev->event_lock, flags);
>         radeon_crtc->unpin_work = NULL;
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel