From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcin Slusarz Subject: Re: [PATCH] drm: Factor-out drm_emit_vblank_event code. (v2) Date: Fri, 29 Apr 2011 17:55:28 +0200 Message-ID: <20110429155528.GA3022@joi.lan> References: <20110428133617.18026c59@jbarnes-desktop> <1304049430-10109-1-git-send-email-christopher.halse.rogers@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 060739E890 for ; Fri, 29 Apr 2011 08:57:27 -0700 (PDT) Received: by fxm14 with SMTP id 14so3461052fxm.36 for ; Fri, 29 Apr 2011 08:57:27 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1304049430-10109-1-git-send-email-christopher.halse.rogers@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: christopher.halse.rogers@canonical.com Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fri, Apr 29, 2011 at 01:57:10PM +1000, christopher.halse.rogers@canonical.com wrote: > From: Christopher James Halse Rogers > > v2: Also pull out the drm_vblank_put call. > Signed-off-by: Christopher James Halse Rogers > --- > drivers/gpu/drm/drm_irq.c | 44 ++++++++++++++++++-------------------------- > 1 files changed, 18 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c > index 982ca8c..da56685 100644 > --- a/drivers/gpu/drm/drm_irq.c > +++ b/drivers/gpu/drm/drm_irq.c > @@ -931,6 +931,20 @@ void drm_vblank_put(struct drm_device *dev, int crtc) > } > EXPORT_SYMBOL(drm_vblank_put); > > +static void drm_emit_vblank_event (struct drm_device *dev, > + struct drm_pending_vblank_event *e, > + unsigned int seq, struct timeval *now) > +{ > + e->event.sequence = seq; > + e->event.tv_sec = now->tv_sec; > + e->event.tv_usec = now->tv_usec; > + drm_vblank_put(dev, e->pipe); > + list_move_tail(&e->base.link, &e->base.file_priv->event_list); > + wake_up_interruptible(&e->base.file_priv->event_wait); > + trace_drm_vblank_event_delivered(e->base.pid, e->pipe, > + e->event.sequence); > +} > + > void drm_vblank_off(struct drm_device *dev, int crtc) > { > struct drm_pending_vblank_event *e, *t; > @@ -951,14 +965,7 @@ void drm_vblank_off(struct drm_device *dev, int crtc) > wanted %d, current %d\n", > e->event.sequence, seq); > > - e->event.sequence = seq; > - e->event.tv_sec = now.tv_sec; > - e->event.tv_usec = now.tv_usec; > - drm_vblank_put(dev, e->pipe); > - list_move_tail(&e->base.link, &e->base.file_priv->event_list); > - wake_up_interruptible(&e->base.file_priv->event_wait); > - trace_drm_vblank_event_delivered(e->base.pid, e->pipe, > - e->event.sequence); > + drm_emit_vblank_event(dev, e, seq, &now); > } > > WARN_ON(atomic_read(&dev->vblank_refcount[crtc]) != 0); > @@ -1104,18 +1111,10 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe, > vblwait->request.sequence); > > e->event.sequence = vblwait->request.sequence; > + list_add_tail(&e->base.link, &dev->vblank_event_list); Is &dev->vblank_event_list == &e->base.file_priv->event_list? If they are not equal this is changing the behavior... > if ((seq - vblwait->request.sequence) <= (1 << 23)) { > - e->event.sequence = seq; > - e->event.tv_sec = now.tv_sec; > - e->event.tv_usec = now.tv_usec; > - drm_vblank_put(dev, pipe); > - list_add_tail(&e->base.link, &e->base.file_priv->event_list); > - wake_up_interruptible(&e->base.file_priv->event_wait); > - vblwait->reply.sequence = seq; Is it OK to drop this substitution? > - trace_drm_vblank_event_delivered(current->pid, pipe, > - vblwait->request.sequence); > + drm_emit_vblank_event(dev, e, seq, &now); > } else { > - list_add_tail(&e->base.link, &dev->vblank_event_list); > vblwait->reply.sequence = vblwait->request.sequence; > } > > @@ -1249,14 +1248,7 @@ void drm_handle_vblank_events(struct drm_device *dev, int crtc) > DRM_DEBUG("vblank event on %d, current %d\n", > e->event.sequence, seq); > > - e->event.sequence = seq; > - e->event.tv_sec = now.tv_sec; > - e->event.tv_usec = now.tv_usec; > - drm_vblank_put(dev, e->pipe); > - list_move_tail(&e->base.link, &e->base.file_priv->event_list); > - wake_up_interruptible(&e->base.file_priv->event_wait); > - trace_drm_vblank_event_delivered(e->base.pid, e->pipe, > - e->event.sequence); > + drm_emit_vblank_event(dev, e, seq, &now); > } > > spin_unlock_irqrestore(&dev->event_lock, flags); > --