From patchwork Wed Aug 12 15:00:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 7002521 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 379E19F358 for ; Wed, 12 Aug 2015 15:01:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CA95206C0 for ; Wed, 12 Aug 2015 15:01:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9094E2067D for ; Wed, 12 Aug 2015 15:01:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C62496EB8E; Wed, 12 Aug 2015 08:01:52 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 551A16EB8E for ; Wed, 12 Aug 2015 08:01:52 -0700 (PDT) Received: by pacrr5 with SMTP id rr5so16302760pac.3 for ; Wed, 12 Aug 2015 08:01:52 -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=79I0jNbO66CG/FnE4pg6aQuCxLoR+KrJNvHdxF7kMIc=; b=y5sQBJClcAJrozC5+LSQuHDUUGI7UivM91PeoIz56PTdI8nIvzgLv0urEbWYLgRxyg d8jmVsGUO2OzgiW9gz60HpEHonY+SUV7gMaRPDk2u093RDlyA97/PTdGCqGHyT5HrX7s Cq+6zk0wbVjQ+rLYpzwOqb/9eDUnwsqXW3ahsnHO0zq4VOEqhB1Y0vf81wteJtPDnhon yjQztBN3fH1th5RMPS7yMCqxF3Uz8SHa3KOvgGvs8dMJlNIPNGzwfb3tXqyC3XVaDjmw EjHDmOz2DMY9LAj+0oSWiNxzRfNAZKI7SCe1nwaZorCfl8hh/p0h/taoZZCbxdWGkCvv K8VQ== X-Received: by 10.66.149.102 with SMTP id tz6mr827947pab.125.1439391712097; Wed, 12 Aug 2015 08:01:52 -0700 (PDT) Received: from localhost (port-17141.pppoe.wtnet.de. [46.59.128.142]) by smtp.gmail.com with ESMTPSA id q5sm6779931pde.56.2015.08.12.08.01.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2015 08:01:51 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH 07/13] drm/sti: Store correct CRTC index in events Date: Wed, 12 Aug 2015 17:00:29 +0200 Message-Id: <1439391635-29166-7-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1439391635-29166-1-git-send-email-thierry.reding@gmail.com> References: <1439391635-29166-1-git-send-email-thierry.reding@gmail.com> Cc: Daniel Vetter , Benjamin Gaignard 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. 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 26e63bf14efe..67279cc74348 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c @@ -234,7 +234,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;