From patchwork Tue Dec 16 16:53:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5502121 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BB708BEEA8 for ; Tue, 16 Dec 2014 16:54:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03C6920A23 for ; Tue, 16 Dec 2014 16:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DC2C20A1C for ; Tue, 16 Dec 2014 16:53:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751262AbaLPQx6 (ORCPT ); Tue, 16 Dec 2014 11:53:58 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:61913 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751049AbaLPQx6 (ORCPT ); Tue, 16 Dec 2014 11:53:58 -0500 Received: by mail-pa0-f53.google.com with SMTP id kq14so14478842pab.40 for ; Tue, 16 Dec 2014 08:53:57 -0800 (PST) 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=hYK/vhnrSEbgyv70d5owFb0F5UX9c6bTA1z9zmy7oPg=; b=Rh3J7ltQlG8jWmloTSFSDCq7lZZS01Ijrj0mVve5607OyvcK7NXkh2wCre0jrQwewA W2ua6QTX8sZDaqfofT956YygyUg/9iWbDgmaVwt8dc6glAPZhSMHE6cxCzKHbKbs4lt3 ZYD+mGOBp+RDKN/cNWz0NASV9/ubP6Ijdsi0NOQMQYWXQFpjY6L1r1T3alwtEuM8HQYR gvU2nzQeU9+201812cPmdPFH6eNS/YYNbrkVafAGli+htJP0dKiXiMm9Tl2AOUYRvWUc r1MuQCGpAzOLolY6E6LVaYnrq6mo7bPijWB54dgoGJaf37aWPWgYzoLXafs2fqCDEdAW j++g== X-Received: by 10.68.65.35 with SMTP id u3mr62853368pbs.9.1418748837473; Tue, 16 Dec 2014 08:53:57 -0800 (PST) Received: from localhost ([216.228.120.20]) by mx.google.com with ESMTPSA id pv3sm1442527pbb.56.2014.12.16.08.53.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Dec 2014 08:53:56 -0800 (PST) From: Thierry Reding To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Inki Dae , Philipp Zabel , Gerd Hoffmann , Mark Yao , Benjamin Gaignard , linux-samsung-soc@vger.kernel.org Subject: [PATCH 05/13] drm/imx: Store correct CRTC index in events Date: Tue, 16 Dec 2014 17:53:27 +0100 Message-Id: <1418748815-15434-5-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1418748815-15434-1-git-send-email-thierry.reding@gmail.com> References: <1418748815-15434-1-git-send-email-thierry.reding@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Signed-off-by: Thierry Reding Acked-by: Philipp Zabel --- 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 ebee59cb96d8..df3e8b6101b3 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -209,7 +209,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);