From patchwork Wed Dec 11 10:34:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3324061 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC74D9F37A for ; Wed, 11 Dec 2013 10:36:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ECAD20164 for ; Wed, 11 Dec 2013 10:36:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 074AB2018E for ; Wed, 11 Dec 2013 10:36:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B151105779; Wed, 11 Dec 2013 02:35:47 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A5F8FB572 for ; Wed, 11 Dec 2013 02:35:11 -0800 (PST) Received: by mail-ea0-f179.google.com with SMTP id r15so2799071ead.24 for ; Wed, 11 Dec 2013 02:35:10 -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=MsagY2Ij9QNxPmdt/+hFr5lBFIYw2Sno8hFgR/HkNqg=; b=VtYCqVmsklUQaEmJJdt+dPiRBNt2mFVWH14BkNR/AcyFgZHZgwPHQvMyeqoLja51Ss djL8ibjHskYoC9L9UAYdfSnrKJzBCJGfRkwM0rmFJw9vbFeCYpfglt86i2dlkyhSB7Y+ GcnL8cp4v6bbjiWZADQkmGb1RIKiy37RkuJgY= 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=MsagY2Ij9QNxPmdt/+hFr5lBFIYw2Sno8hFgR/HkNqg=; b=OGk1zsX9JxWJRqVD1CMuOxjSV1IS7b2kItjDEYjdrxUlm2D7pNb799XZtD2xuYa2IN 4z6+cPXHdFcFXJhhKVp3W9rWxxTR52kCbz8i/N+pGt06ji+K3ZWCR+ra3B86VkAkBhZs kR+JqL5WGcd9reF9cGpwAAw1HsNcrt987vb/YzyS9xUp/GYi3ustHWAP2gJFDrUaDbpz R6z4nFKmfp7OGPQjhz7T2qFBE0LnL/ugA1U8dSNz9rI5H7PV2TQKLPXvr5mvH3s2UG7x OsQh5pTyep0uSZTPy9pw8e66Hk6OKqnz5ZNK3WXaODKNHTfrhR6HRT2vqnGBDPEB+D/t aGRg== X-Gm-Message-State: ALoCoQkI64wY+VvLC1TfjzNDz9qItgd0a1tcIg13j2aNG6d7lE3clQ2B2IjOaKnomKaG/b2Ghdz5 X-Received: by 10.14.208.199 with SMTP id q47mr850819eeo.77.1386758110810; Wed, 11 Dec 2013 02:35:10 -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 b41sm51932269eef.16.2013.12.11.02.35.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 02:35:10 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 31/50] drm/irq: drm_control is a legacy ioctl, so pci devices only Date: Wed, 11 Dec 2013 11:34:52 +0100 Message-Id: <1386758111-3446-32-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> References: <1386758111-3446-1-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.3 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 This just adds a correspdonding check, follow-up patches will exploit this. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_irq.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index f70d3b9b7b22..3faf1e94df02 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -386,22 +386,22 @@ int drm_control(struct drm_device *dev, void *data, * this used to be a separate function in drm_dma.h */ + if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) + return 0; + if (drm_core_check_feature(dev, DRIVER_MODESET)) + return 0; + /* UMS was only ever support on pci devices. */ + if (WARN_ON(!dev->pdev)) + return -EINVAL; switch (ctl->func) { case DRM_INST_HANDLER: - if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) - return 0; - if (drm_core_check_feature(dev, DRIVER_MODESET)) - return 0; if (dev->if_version < DRM_IF_VERSION(1, 2) && ctl->irq != drm_dev_to_irq(dev)) return -EINVAL; + return drm_irq_install(dev); case DRM_UNINST_HANDLER: - if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) - return 0; - if (drm_core_check_feature(dev, DRIVER_MODESET)) - return 0; return drm_irq_uninstall(dev); default: return -EINVAL;