From patchwork Fri Apr 11 21:36:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3972131 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 2DE24C0DA2 for ; Fri, 11 Apr 2014 21:36:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FD3A2034C for ; Fri, 11 Apr 2014 21:36:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 855EC2034B for ; Fri, 11 Apr 2014 21:36:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F3EC6EE3E; Fri, 11 Apr 2014 14:36:28 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com [74.125.83.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B24F6EE3A for ; Fri, 11 Apr 2014 14:36:26 -0700 (PDT) Received: by mail-ee0-f51.google.com with SMTP id c13so4554288eek.38 for ; Fri, 11 Apr 2014 14:36:25 -0700 (PDT) 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=d+8KIxhbae7OSr4B8RahdNAwoetRtQ3tl283oxNNuZw=; b=XWVkkd+IlBJZYhQ5ud9KS1biy9Tqj4g9pGDV0DGAfTDTbIdcgL1/mRE0Lk8MgeEvOy pV9/bIHpEeDY96r2m/t+jObb73X/a9X39obbNjGjwuqZl2jMcXBcVGvZkSasYCQiB1qS 3s20UrZtxF+IP9pCR/naCcBzmOOC61H+ktcgE= 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=d+8KIxhbae7OSr4B8RahdNAwoetRtQ3tl283oxNNuZw=; b=Vmr5LfgqRBY0bWhuzg+C5/Rx2fea8z7Zn+MBRMPnG3+9MVxayFpj2kXpfvSP+KqRCM 1MmO1fHhnhqnoyMcwDnyI7NnVINMTN/HlJYeMM3Yn9cCcl3lIq0l5YD/4ChICc37/NNL bTgMPB/mnzip3zhJ3PPKDMW21Byh/hbmfn4HJgdaf4a0cuuJl0WSikKpMoobWsQHxeLW krXB9EuYhf0rujFu6zq0PbmfKmlkAa2eh7dBbGLGXRJs2aJt1MVsJJdi7BLtF8CD0541 wbYVPQAExVCN/nfr84weTzCiHScPZL3TU/6nnNoAF1v9CvnO3D0cGPsbwN8S05Qdd1U5 vT1g== X-Gm-Message-State: ALoCoQlo3dJTTrg11w79CEnrEavXF8cg1U6cvWk6kuxzA1Lh/2yUx/H9ng5FGp9DNcYoD4a2Pq16 X-Received: by 10.14.95.8 with SMTP id o8mr31554485eef.15.1397252185753; Fri, 11 Apr 2014 14:36:25 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id 48sm20509221eee.2.2014.04.11.14.36.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Apr 2014 14:36:24 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 04/18] drm/irq: drm_control is a legacy ioctl, so pci devices only Date: Fri, 11 Apr 2014 23:36:01 +0200 Message-Id: <1397252175-14227-5-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1397252175-14227-1-git-send-email-daniel.vetter@ffwll.ch> References: <1397252175-14227-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.5 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 Reviewed-by: Thierry Reding --- 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 c02b602325cb..4b019646f556 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;