From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752939AbcFFQCY (ORCPT ); Mon, 6 Jun 2016 12:02:24 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36536 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbcFFQCW (ORCPT ); Mon, 6 Jun 2016 12:02:22 -0400 Date: Mon, 6 Jun 2016 18:02:18 +0200 From: Daniel Vetter To: Gustavo Padovan Cc: dri-devel@lists.freedesktop.org, "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , open list , Ben Skeggs , Gustavo Padovan Subject: Re: [PATCH 01/14] drm/nouveau: use drm_crtc_send_vblank_event() v2 Message-ID: <20160606160218.GB10110@phenom.ffwll.local> Mail-Followup-To: Gustavo Padovan , dri-devel@lists.freedesktop.org, "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , open list , Ben Skeggs , Gustavo Padovan References: <1465224105-21485-1-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1465224105-21485-1-git-send-email-gustavo@padovan.org> X-Operating-System: Linux phenom 4.6.0-rc5+ User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 06, 2016 at 11:41:32AM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan > > 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 > Signed-off-by: Gustavo Padovan Forgot to squash this into the main nouveau patch as fixup? -Daniel > --- > 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 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch