[PATCH 01/14] drm/nouveau: use drm_crtc_send_vblank_event() v2

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.pado...@collabora.co.uk>

Replace the legacy drm_send_vblank_event() with the new helper function.

v2: add crtc to nouveau_page_flip_state (comment from Mario Kleiner)

Cc: Mario Kleiner <mario.kleiner.de at gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
---
 drivers/gpu/drm/nouveau/nouveau_display.c | 19 ++++++++++---------
 drivers/gpu/drm/nouveau/nouveau_display.h |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c 
b/drivers/gpu/drm/nouveau/nouveau_display.c
index 7c77f96..9d72467 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -760,8 +760,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct 
drm_framebuffer *fb,

        /* Initialize a page flip struct */
        *s = (struct nouveau_page_flip_state)
-               { { }, event, nouveau_crtc(crtc)->index,
-                 fb->bits_per_pixel, fb->pitches[0], crtc->x, crtc->y,
+               { { }, event, crtc, fb->bits_per_pixel, fb->pitches[0],
                  new_bo->bo.offset };

        /* Keep vblanks on during flip, for the target crtc of this flip */
@@ -842,17 +841,18 @@ nouveau_finish_page_flip(struct nouveau_channel *chan,
        s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head);
        if (s->event) {
                if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
-                       drm_arm_vblank_event(dev, s->crtc, s->event);
+                       drm_arm_vblank_event(dev, drm_crtc_index(s->crtc),
+                                            s->event);
                } else {
-                       drm_send_vblank_event(dev, s->crtc, s->event);
+                       drm_crtc_send_vblank_event(s->crtc, s->event);

                        /* Give up ownership of vblank for page-flipped crtc */
-                       drm_vblank_put(dev, s->crtc);
+                       drm_vblank_put(dev, drm_crtc_index(s->crtc));
                }
        }
        else {
                /* Give up ownership of vblank for page-flipped crtc */
-               drm_vblank_put(dev, s->crtc);
+               drm_vblank_put(dev, drm_crtc_index(state->crtc));
        }

        list_del(&s->head);
@@ -873,9 +873,10 @@ nouveau_flip_complete(struct nvif_notify *notify)

        if (!nouveau_finish_page_flip(chan, &state)) {
                if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
-                       nv_set_crtc_base(drm->dev, state.crtc, state.offset +
-                                        state.y * state.pitch +
-                                        state.x * state.bpp / 8);
+                       nv_set_crtc_base(drm->dev, drm_crtc_index(state.crtc),
+                                        state.offset + state.crtc->y *
+                                        state.pitch + state.crtc->x *
+                                        state.bpp / 8);
                }
        }

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h 
b/drivers/gpu/drm/nouveau/nouveau_display.h
index 24273ba..0420ee8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -28,7 +28,8 @@ int nouveau_framebuffer_init(struct drm_device *, struct 
nouveau_framebuffer *,
 struct nouveau_page_flip_state {
        struct list_head head;
        struct drm_pending_vblank_event *event;
-       int crtc, bpp, pitch, x, y;
+       struct drm_crtc *crtc;
+       int bpp, pitch;
        u64 offset;
 };

-- 
2.5.5