From patchwork Mon Oct 8 19:50:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12045 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F2E1623FB3 for ; Mon, 8 Oct 2012 19:51:18 +0000 (UTC) Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52]) by fiordland.canonical.com (Postfix) with ESMTP id A0948A18B70 for ; Mon, 8 Oct 2012 19:51:18 +0000 (UTC) Received: by mail-pa0-f52.google.com with SMTP id hz10so4789627pad.11 for ; Mon, 08 Oct 2012 12:51:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=NTAWK/5q5K+guGLwOzuU3tpGhpKGrhniwHvHW9BYLzM=; b=ONCZJb7gaUKxrzNqvpIYHT2UPfsKlC+Wkp56wq5JGDbSkbuRq4N/JHe2MR5LusNNl2 erzRSE6z4MCRrX4zxyzsLZ9LcJqO8PBhWVpJtEptvKB2g3Q+tmctwmn5ufDMY8rihjGQ SAPY5o0PepSMYqRoHMdeLCG23wsTEInU464YStw3uSv0X0fK/DaMtUdacKXtDWdD1+iq FW5VBzsNHARiJQxsDyIvf17WNAI8gwJgioYDkUNhNz96bZjr825qa91Omzlt2Ouriq1z FxNqVL1PmjthKrrjF3ixEzKM/lxjCW4h8i5lKGZpGVjEuT1TyPjtEqtJ3F5Jgf/YIJ3B kiIw== Received: by 10.68.232.163 with SMTP id tp3mr56245687pbc.44.1349725877877; Mon, 08 Oct 2012 12:51:17 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.68.34.137 with SMTP id z9csp314483pbi; Mon, 8 Oct 2012 12:51:17 -0700 (PDT) Received: by 10.182.177.99 with SMTP id cp3mr1000369obc.92.1349725877077; Mon, 08 Oct 2012 12:51:17 -0700 (PDT) Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id b5si4948733obl.208.2012.10.08.12.51.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 08 Oct 2012 12:51:17 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-ob0-f178.google.com with SMTP id tb18so4877681obb.37 for ; Mon, 08 Oct 2012 12:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=NTAWK/5q5K+guGLwOzuU3tpGhpKGrhniwHvHW9BYLzM=; b=RPTBWPp139s1NcN5gboHK0ET5KVlcnXMCqR8ZCkjTjsawrfLj2v7iqt9x1l/YUlHCN ILaUfaseAeTKTrh4AZNIntvMVXSaq3YGHN9jqSPrycek+BxpwVoZxQtoDnoq8wbUVQKF tAR9DG3bt4Vymg252E90Sd0AA25RjpgNpy6nMykL6bIWFVO4/OslWTsAHgPmsiXsiOwc Qd5q6m4U5T3Ju9CwGTbg45jFwIp9Ba6O2blrUynmiV1WLtb6MtQe+cmmnxY7mX3O98Gj 40ZmiKpTgMHAhBCld4NeH2N6UWS6pxS42XFAwzofy2HDOTkG7sPyIXFGhVlF+pMT2p9y FtZg== Received: by 10.60.22.104 with SMTP id c8mr14063095oef.2.1349725876674; Mon, 08 Oct 2012 12:51:16 -0700 (PDT) Received: from localhost (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id nd14sm17996718obb.14.2012.10.08.12.51.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 08 Oct 2012 12:51:16 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, airlied@linux.ie, daniel.vetter@ffwll.ch, bskeggs@redhat.com, inki.dae@samsung.com, laurent.pinchart@ideasonboard.com, s.hauer@pengutronix.de, gregkh@linuxfoundation.org, Rob Clark Subject: [PATCH 02/11] drm/i915: use drm_send_vblank_event() helper Date: Mon, 8 Oct 2012 14:50:40 -0500 Message-Id: <1349725849-22433-3-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349725849-22433-1-git-send-email-rob.clark@linaro.org> References: <1349725849-22433-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQkgbEzEIoH3/b+1gDlcdLMbQFYGvSuHIUxswHPb3uYkbwXLRTP5bgi/wDqPOd0mhbhRn0iK From: Rob Clark Signed-off-by: Rob Clark 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);