Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964836AbcDYUGr (ORCPT ); Mon, 25 Apr 2016 16:06:47 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:43923 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933160AbcDYUGq (ORCPT ); Mon, 25 Apr 2016 16:06:46 -0400 Date: Mon, 25 Apr 2016 17:06:33 -0300 From: Gustavo Padovan To: Mario Kleiner Cc: Gustavo Padovan , dri-devel@lists.freedesktop.org, David Airlie , Ben Skeggs , Daniel Vetter , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Dave Airlie , Ilia Mirkin , Thierry Reding , open list Subject: Re: [PATCH 07/14] drm/nouveau: use drm_crtc_send_vblank_event() Message-ID: <20160425200633.GA7857@joana> References: <1460656118-16766-1-git-send-email-gustavo@padovan.org> <1460656118-16766-7-git-send-email-gustavo@padovan.org> <571DC0B6.90504@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <571DC0B6.90504@gmail.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1563 Lines: 43 Hi Mario, 2016-04-25 Mario Kleiner : > On 04/14/2016 07:48 PM, Gustavo Padovan wrote: > >From: Gustavo Padovan > > > >Replace the legacy drm_send_vblank_event() with the new helper function. > > > >Signed-off-by: Gustavo Padovan > >--- > > drivers/gpu/drm/nouveau/nouveau_display.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > >diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > >index 7ce7fa5..973c2d9 100644 > >--- a/drivers/gpu/drm/nouveau/nouveau_display.c > >+++ b/drivers/gpu/drm/nouveau/nouveau_display.c > >@@ -841,10 +841,12 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, > > > > s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); > > Hi Gustavo > > > if (s->event) { > >+ struct drm_crtc *crtc = drm_crtc_find(dev, s->crtc); > >+ > > I don't think this would work. s->crtc is a nouveau internal display pipe > index, not a drm mode object id, so i don't think drm_crtc_find() will do > what you need. Also it takes a mutex, which might_sleep() and i think > nouveau_finish_page_flip gets called from irq context and holds a > spin_lock_irqsave, so would end badly. You are right. I didn't pay attention that the id wasn't a object id. > > You'd probably have to extend struct nouveau_page_flip_state to carry around > a reference to the required drm_crtc, set up in nouveau_crtc_page_flip(). Yeah, that may be a good solution. Gustavo