From patchwork Tue Dec 16 16:53:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5502251 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 093C7BEEA8 for ; Tue, 16 Dec 2014 16:54:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9583B20A26 for ; Tue, 16 Dec 2014 16:54:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6ED6A20A27 for ; Tue, 16 Dec 2014 16:54:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751448AbaLPQyD (ORCPT ); Tue, 16 Dec 2014 11:54:03 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:61096 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751290AbaLPQyC (ORCPT ); Tue, 16 Dec 2014 11:54:02 -0500 Received: by mail-pa0-f45.google.com with SMTP id lf10so13868560pab.32 for ; Tue, 16 Dec 2014 08:54:02 -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=CQ83YPczXD/WID581jNW2L1F90rso+dr7JxDgHOihkc=; b=Js4fLmKeV24RKmNbnpP7/Yj4WA+q+4v8qoZJL5dR7CoE31WNGBBBGzsd6W/utQnWOX f874Ljf0swLO0OTG0MYOAzAbFQzgu71iMXJSUypzETZd9+7J3w88b2iiBub/kwFkqggl GOqLV32P/bcsvo5fCDvjHND1NYkaw3W2YJ3C/RRPJ1Aygh1Zk0G/+2p5CXliXHPxWEFQ t/bebT1IlaCvDS0P9DxoswFt3SJvuJOEd5kmZF7OgmHnPw5NTHejQKn7dRzj4KUjZrvF sUn7VgVOEnZxwhCinW04uxeofY3v8PxO6ZIZT18lEIkGs4tV0zxcBMQWUFo1ft1FjlFL oW1Q== X-Received: by 10.70.64.197 with SMTP id q5mr464116pds.129.1418748841727; Tue, 16 Dec 2014 08:54:01 -0800 (PST) Received: from localhost ([216.228.120.20]) by mx.google.com with ESMTPSA id w14sm1511842pas.14.2014.12.16.08.54.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Dec 2014 08:54:01 -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 06/13] drm/rockchip: Store correct CRTC index in events Date: Tue, 16 Dec 2014 17:53:28 +0100 Message-Id: <1418748815-15434-6-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=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. Rockchip does support VBLANKs, so there is no need for the fallback code. Cc: Mark Yao Signed-off-by: Thierry Reding --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index e7ca25b3fb38..999616d216ac 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -958,7 +958,7 @@ static void vop_win_state_complete(struct vop_win *vop_win, if (state->event) { spin_lock_irqsave(&drm->event_lock, flags); - drm_send_vblank_event(drm, -1, state->event); + drm_send_vblank_event(drm, vop->pipe, state->event); spin_unlock_irqrestore(&drm->event_lock, flags); }