From patchwork Thu Sep 24 16:35:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 7258101 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 4CCC89F30C for ; Thu, 24 Sep 2015 16:36:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82E052055D for ; Thu, 24 Sep 2015 16:36:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A58A920414 for ; Thu, 24 Sep 2015 16:35:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8AB77A0FF; Thu, 24 Sep 2015 09:35:58 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3089C7A114 for ; Thu, 24 Sep 2015 09:35:57 -0700 (PDT) Received: by pacfv12 with SMTP id fv12so78796240pac.2 for ; Thu, 24 Sep 2015 09:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qwkTHXLkJIF2oVZ+AB7mbADclMR+GeKW5cI6X8gvWhc=; b=G3E9qnaonUDVQwjqbTR4zB1yzP5tcnrAkiZzD8dfMEAATAqb8p9zgmFWAQ5YVv8SBa jAqrIKmEgiAIAQh+3dAsfg9prpxICcDGHJ42d7lvWUjNp1g4p5/EJs8zf4b1yMXrsgmZ pq1FDiFXvdARiZnmLGVbuJvmeJu3rrGxvdorupDvuf02rrwizHYr0WXDJiq4y2CR6DTu lSwANsKTASQjYNAXk8odwj+ILd0PWebrcy4e/PNg8MnW06a3pL51d4BgTJgc3tEgTgzT AIT6MkB6mSHG7ElLlw/RqMapxrX/8edY1GFhDrOfXIPAymW38RdgyOcaITSrYd1JMZUB KbZw== X-Received: by 10.66.160.194 with SMTP id xm2mr669664pab.111.1443112556902; Thu, 24 Sep 2015 09:35:56 -0700 (PDT) Received: from localhost (port-5631.pppoe.wtnet.de. [84.46.22.21]) by smtp.gmail.com with ESMTPSA id fb1sm5546146pab.9.2015.09.24.09.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 09:35:56 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH 05/16] drm/imx: Store correct CRTC index in events Date: Thu, 24 Sep 2015 18:35:27 +0200 Message-Id: <1443112538-9616-5-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1443112538-9616-1-git-send-email-thierry.reding@gmail.com> References: <1443112538-9616-1-git-send-email-thierry.reding@gmail.com> 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Thierry Reding A negative pipe causes a special case to be triggered for drivers that don't have proper VBLANK support. i.MX does support VBLANKs, so there is no need for the fallback code. Cc: Philipp Zabel Acked-by: Philipp Zabel Signed-off-by: Thierry Reding --- drivers/gpu/drm/imx/ipuv3-crtc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c index 7bc8301fafff..a10da8e011c2 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -212,7 +212,8 @@ static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc) spin_lock_irqsave(&drm->event_lock, flags); if (ipu_crtc->page_flip_event) - drm_send_vblank_event(drm, -1, ipu_crtc->page_flip_event); + drm_send_vblank_event(drm, imx_drm_crtc_id(ipu_crtc->imx_crtc), + ipu_crtc->page_flip_event); ipu_crtc->page_flip_event = NULL; imx_drm_crtc_vblank_put(ipu_crtc->imx_crtc); spin_unlock_irqrestore(&drm->event_lock, flags);