From patchwork Mon Dec 16 10:30:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3353041 Return-Path: X-Original-To: patchwork-dri-devel@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 30C02C0D4A for ; Mon, 16 Dec 2013 10:29:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32D9C202FE for ; Mon, 16 Dec 2013 10:29:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 13A83202F8 for ; Mon, 16 Dec 2013 10:29:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E09CFA354; Mon, 16 Dec 2013 02:29:26 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DA14FA351 for ; Mon, 16 Dec 2013 02:29:24 -0800 (PST) Received: by mail-ea0-f171.google.com with SMTP id h10so2107379eak.16 for ; Mon, 16 Dec 2013 02:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RD+Ksd3mSlkhpHJTPhTj8yEJDgd5I2QP6SNVgjt+5uM=; b=Dee0kVH8fL2YTZ78EorFkEwVdorVt2RY3dSHRprDqMNaLgY7vmntWDEQg9v3zNEpD8 kZOJp04r6v5pp3Mi5xbtFJXCYULAvtLbV2JlPlGHXsuq2EKFb/3lqAGJpN49rUUTAq07 OGI0s4+bjNSDuzOx8A0TuGSX2jYcPzvcFVeG0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RD+Ksd3mSlkhpHJTPhTj8yEJDgd5I2QP6SNVgjt+5uM=; b=V23AIeDrjmcyrISurNBut6cYh3yWW4EjOmHmMmyhUG8pUKqsxwakP4uO9gLyRV9LC4 tnExW0sUJQCyKF/bWNOzcsKsebT4DPALB4ApHAjjyJ3fLYINK2qyP7cJWGhhSd9mhc5y AVJfdcm5RNlcGiiR5x3M5jk8SV+Bx9htbKHH1j+vUEvVXNchVF42k7Ry6+H1ftgtTHDt wHddn+G6TdsgQ9KTi9Uj78xgM8buYbs5gnwar/HwDnqLxXeopjiUOFSbcYF3ajVP4/rZ bBH50vkw9RX7BWRC1EjrKjOr6NkqoBnMmIxHXZlYmgHb96nYcARTzab+N5GgtypQ5uxz wAZw== X-Gm-Message-State: ALoCoQlXcGhoxSDeRrG94/VFjGSTNZCjCRACdnZwzSzIE/4Fs9/Tr1QTB1JBZR6i8wEr94Q0jt1T X-Received: by 10.14.219.4 with SMTP id l4mr15758045eep.94.1387189763697; Mon, 16 Dec 2013 02:29:23 -0800 (PST) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id v1sm40579056eef.9.2013.12.16.02.29.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2013 02:29:22 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/irq: simplify irq checks in drm_wait_vblank Date: Mon, 16 Dec 2013 11:30:13 +0100 Message-Id: <1387189813-3677-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386758111-3446-30-git-send-email-daniel.vetter@ffwll.ch> References: <1386758111-3446-30-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Checking for both an irq number _and_ whether it's enabled is redundant. Originally I've thought the drm_dev_to_irq call would break drivers which do their own irq checking, but those shouldn't have DRIVER_HAVE_IRQ set as Thierry Reding pointed out. But such drivers already need to set dev->irq_enabled for other reasons, so we might as well ditch that check, too. v2: Also drop the HAVE_IRQ check. Cc: Thierry Reding Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/drm_irq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index c0c6bdedefef..f83e72cd5215 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1185,9 +1185,8 @@ int drm_wait_vblank(struct drm_device *dev, void *data, int ret; unsigned int flags, seq, crtc, high_crtc; - if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) - if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled)) - return -EINVAL; + if (!dev->irq_enabled) + return -EINVAL; if (vblwait->request.type & _DRM_VBLANK_SIGNAL) return -EINVAL;