From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 02/11] drm/i915: use drm_send_vblank_event() helper Date: Tue, 9 Oct 2012 10:02:18 +0200 Message-ID: <20121009080217.GA5844@phenom.ffwll.local> References: <1349725849-22433-1-git-send-email-rob.clark@linaro.org> <1349725849-22433-3-git-send-email-rob.clark@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id B5FB4A0962 for ; Tue, 9 Oct 2012 01:01:29 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hj13so3852431wib.12 for ; Tue, 09 Oct 2012 01:01:28 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1349725849-22433-3-git-send-email-rob.clark@linaro.org> 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: Rob Clark Cc: patches@linaro.org, daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org, bskeggs@redhat.com, gregkh@linuxfoundation.org, Rob Clark , laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org On Mon, Oct 08, 2012 at 02:50:40PM -0500, Rob Clark wrote: > From: Rob Clark > > Signed-off-by: Rob Clark Maybe note in the commit message that after this change pageflip events will also fire the vblank_event_delivered tracepoint. Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/i915/intel_display.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index f5bcf6f..4716c83 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6158,8 +6158,6 @@ static void do_intel_finish_page_flip(struct drm_device *dev, > struct intel_crtc *intel_crtc = to_intel_crtc(crtc); > struct intel_unpin_work *work; > struct drm_i915_gem_object *obj; > - struct drm_pending_vblank_event *e; > - struct timeval tvbl; > unsigned long flags; > > /* Ignore early vblank irqs */ > @@ -6175,17 +6173,8 @@ static void do_intel_finish_page_flip(struct drm_device *dev, > > intel_crtc->unpin_work = NULL; > > - if (work->event) { > - e = work->event; > - e->event.sequence = drm_vblank_count_and_time(dev, intel_crtc->pipe, &tvbl); > - > - e->event.tv_sec = tvbl.tv_sec; > - e->event.tv_usec = tvbl.tv_usec; > - > - list_add_tail(&e->base.link, > - &e->base.file_priv->event_list); > - wake_up_interruptible(&e->base.file_priv->event_wait); > - } > + if (work->event) > + drm_send_vblank_event(dev, intel_crtc->pipe, work->event); > > drm_vblank_put(dev, intel_crtc->pipe); > > -- > 1.7.9.5 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch