From patchwork Tue Dec 16 16:53:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5502181 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2746D9F1D4 for ; Tue, 16 Dec 2014 16:54:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47C6820A24 for ; Tue, 16 Dec 2014 16:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77AE120A1E for ; Tue, 16 Dec 2014 16:54:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751570AbaLPQyH (ORCPT ); Tue, 16 Dec 2014 11:54:07 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:37699 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096AbaLPQyG (ORCPT ); Tue, 16 Dec 2014 11:54:06 -0500 Received: by mail-pa0-f43.google.com with SMTP id kx10so14498249pab.30 for ; Tue, 16 Dec 2014 08:54:06 -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=fB7MWmIOIag63l7gAs8m02f7WGS1irxTuYjYLZpN7Gg=; b=t+c+mx76QpEjZGgOkg3gaaYlKqP9MQ/lFn6WzDk40ep1mkyY3SPxOl4yn6Uh34rF0z caT+RTfKrzPHGU6hl0K3IYosCTi3cB9RjFMTfobZGF9GIz44QuVXDhVowpFU8dQe2d4d on6jD32eQ8P5Z/FYaHjs3XQ9I3IkWdjf30Kbw5BfoC8UQ10nHIKCN0Od4WaJR+t0JBFu RMLizIuOlcdTJaYgaxS6LMjHPqoyumLZ3S/hJT+SULFi2RlLEP6RhWQ91gcuggt3siMq oW6kpkWOLZsP/5FNTb4xxv38L5/L5g/vYxfhU2NfTRJpK9cj+TwIefbVSwxOH1MYiLaZ QYYg== X-Received: by 10.68.65.35 with SMTP id u3mr62854416pbs.9.1418748845877; Tue, 16 Dec 2014 08:54:05 -0800 (PST) Received: from localhost ([216.228.120.20]) by mx.google.com with ESMTPSA id ny9sm1496940pab.25.2014.12.16.08.54.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Dec 2014 08:54:05 -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 07/13] drm/sti: Store correct CRTC index in events Date: Tue, 16 Dec 2014 17:53:29 +0100 Message-Id: <1418748815-15434-7-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. STi does support VBLANKs, so there is no need for the fallback code. Cc: Benjamin Gaignard Signed-off-by: Thierry Reding --- drivers/gpu/drm/sti/sti_drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c index e6f6ef7c4866..13bfe7bcb167 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c @@ -332,7 +332,7 @@ int sti_drm_crtc_vblank_cb(struct notifier_block *nb, spin_lock_irqsave(&drm_dev->event_lock, flags); if (compo->mixer[*crtc]->pending_event) { - drm_send_vblank_event(drm_dev, -1, + drm_send_vblank_event(drm_dev, *crtc, compo->mixer[*crtc]->pending_event); drm_vblank_put(drm_dev, *crtc); compo->mixer[*crtc]->pending_event = NULL;