|
@@ -199,7 +199,7 @@ static void armada_drm_plane_work_run(struct armada_crtc *dcrtc,
|
|
|
/* Handle any pending frame work. */
|
|
|
if (work) {
|
|
|
work->fn(dcrtc, plane, work);
|
|
|
- drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
|
|
|
+ drm_crtc_vblank_put(&dcrtc->crtc);
|
|
|
}
|
|
|
|
|
|
wake_up(&plane->frame_wait);
|
|
@@ -210,7 +210,7 @@ int armada_drm_plane_work_queue(struct armada_crtc *dcrtc,
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
|
- ret = drm_vblank_get(dcrtc->crtc.dev, dcrtc->num);
|
|
|
+ ret = drm_crtc_vblank_get(&dcrtc->crtc);
|
|
|
if (ret) {
|
|
|
DRM_ERROR("failed to acquire vblank counter\n");
|
|
|
return ret;
|
|
@@ -218,7 +218,7 @@ int armada_drm_plane_work_queue(struct armada_crtc *dcrtc,
|
|
|
|
|
|
ret = cmpxchg(&plane->work, NULL, work) ? -EBUSY : 0;
|
|
|
if (ret)
|
|
|
- drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
|
|
|
+ drm_crtc_vblank_put(&dcrtc->crtc);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -234,7 +234,7 @@ struct armada_plane_work *armada_drm_plane_work_cancel(
|
|
|
struct armada_plane_work *work = xchg(&plane->work, NULL);
|
|
|
|
|
|
if (work)
|
|
|
- drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
|
|
|
+ drm_crtc_vblank_put(&dcrtc->crtc);
|
|
|
|
|
|
return work;
|
|
|
}
|
|
@@ -592,9 +592,9 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc,
|
|
|
|
|
|
if (interlaced ^ dcrtc->interlaced) {
|
|
|
if (adj->flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
- drm_vblank_get(dcrtc->crtc.dev, dcrtc->num);
|
|
|
+ drm_crtc_vblank_get(&dcrtc->crtc);
|
|
|
else
|
|
|
- drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
|
|
|
+ drm_crtc_vblank_put(&dcrtc->crtc);
|
|
|
dcrtc->interlaced = interlaced;
|
|
|
}
|
|
|
|