From patchwork Thu Apr 14 17:48:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8840481 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D7B9F9F71A for ; Thu, 14 Apr 2016 17:49:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEF84202FF for ; Thu, 14 Apr 2016 17:49:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AC69E20373 for ; Thu, 14 Apr 2016 17:49:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 404486EAC5; Thu, 14 Apr 2016 17:49:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-f182.google.com (mail-pf0-f182.google.com [209.85.192.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97D786EABE for ; Thu, 14 Apr 2016 17:48:54 +0000 (UTC) Received: by mail-pf0-f182.google.com with SMTP id 184so48236461pff.0 for ; Thu, 14 Apr 2016 10:48:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IL9/M4Z9JGgtMOUe03xY712dQoQVnhxB5eiU7DvGcHg=; b=azWH+S2jHSKFluUG/QePcw9cHe3Rj6AbNgrGMaMyTm9tOYrTxEc58oW26uCSboQ8hg jJgdRt7DQ2/c/jw6xTLi9dYpfmJbcOgdUAqk5XCcJ9Vdu0hgdCKwwt7iluxYNveWffdT E6K4GuYNygB38l0K3hUDQDr1T7BkjjoIjTdT65+IwfNDHCHaBefBWS9wRQR5tOO0mv0B 6wswV3AyasHctMkovyl1R9GM8KcUYCuT9MLkmPBkCadU7rRe7EgYcAoEKCTZ1uuFPlY0 PzY+691Cc1yzUzyewv/3vBRodDLMxtUjUKgOuaCsSrxd4V3tYJtLLfxe1Kc/n7hRd1ZY Rc+g== X-Gm-Message-State: AOPr4FVkA2hcbysZYaws1pfR4FBWSctGNhcrZEDiO/suaC61pTjcsY8xq3Nwfx8d4owD1g== X-Received: by 10.98.18.71 with SMTP id a68mr23054890pfj.41.1460656133969; Thu, 14 Apr 2016 10:48:53 -0700 (PDT) Received: from jade.localdomain (c-73-241-147-137.hsd1.ca.comcast.net. [73.241.147.137]) by smtp.gmail.com with ESMTPSA id y27sm59344437pfi.11.2016.04.14.10.48.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2016 10:48:53 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH 07/14] drm/nouveau: use drm_crtc_send_vblank_event() Date: Thu, 14 Apr 2016 10:48:18 -0700 Message-Id: <1460656118-16766-7-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460656118-16766-1-git-send-email-gustavo@padovan.org> References: <1460656118-16766-1-git-send-email-gustavo@padovan.org> Cc: Thierry Reding , Daniel Vetter , open list , Ben Skeggs , Dave Airlie , Gustavo Padovan X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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); if (s->event) { + struct drm_crtc *crtc = drm_crtc_find(dev, s->crtc); + if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) { drm_arm_vblank_event(dev, s->crtc, s->event); } else { - drm_send_vblank_event(dev, s->crtc, s->event); + drm_crtc_send_vblank_event(crtc, s->event); /* Give up ownership of vblank for page-flipped crtc */ drm_vblank_put(dev, s->crtc);