From patchwork Wed Aug 7 14:20:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A8CDF912 for ; Wed, 7 Aug 2019 14:21:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98FF028429 for ; Wed, 7 Aug 2019 14:21:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96F0E28A1F; Wed, 7 Aug 2019 14:21:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4CEDF28429 for ; Wed, 7 Aug 2019 14:21:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E6506E714; Wed, 7 Aug 2019 14:21:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw1-xc44.google.com (mail-yw1-xc44.google.com [IPv6:2607:f8b0:4864:20::c44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B1766E712 for ; Wed, 7 Aug 2019 14:21:28 +0000 (UTC) Received: by mail-yw1-xc44.google.com with SMTP id b143so32407733ywb.7 for ; Wed, 07 Aug 2019 07:21:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/676HaJdU+r4xHFqJxKddDqEourGEuCobhxkaMnJuCU=; b=WpQSZxYJISp0ihynqIljDi7YjlnaHEKSp+YUbe7clA/DMR5oqVBVlBuuTDUj8Fg40i yK0v+8jNiLiqIGj8W0MbpEfo8/aCGHRLWOgDME8bpc0d5c/bdQKHejPKOk15C/rzT9Ud tBclJ41dZN38pqikxM8GkNM9HouCVn0qKz1qUz+vsgcsy3GOq9rHkSsXP83DizOPpF/i DyZ42qiLHv0HS0Z2kmL7IMnTUDRM+DxNZFpS47cifGgMnKHwfkH7Y+QVZU25rISfNDlU hkFuJ8gBqmSx8JlAMHZe9/CcWgts6VBN4Zqr/ZCyyXevClGPfMmkOm24pK4Cms1llAaY ceBw== X-Gm-Message-State: APjAAAUNW9XVGCVqy/OTZRY9YPwuN1S+qiOzGiHCFcJq8JIc74awCsD0 xTHQx/Xs7RxYg7QCxTPVWXj8KydY+zg= X-Google-Smtp-Source: APXvYqwjXBtKfCWlpCobL5Wb/vV5kiL5q4okELKCe5aPKkFihTEzN2zaRarnGt9UlEuIVOWvJm7JeQ== X-Received: by 2002:a81:f00d:: with SMTP id p13mr6410579ywm.255.1565187686908; Wed, 07 Aug 2019 07:21:26 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id d204sm20419451ywe.33.2019.08.07.07.21.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:26 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch, airlied@gmail.com, mripard@kernel.org, robh@kernel.org, emil.velikov@collabora.com Subject: [PATCH 5/5] Revert "drm/nouveau: remove open-coded drm_invalid_op()" Date: Wed, 7 Aug 2019 10:20:58 -0400 Message-Id: <20190807142101.251400-6-sean@poorly.run> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190807142101.251400-1-sean@poorly.run> References: <20190807142101.251400-1-sean@poorly.run> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/676HaJdU+r4xHFqJxKddDqEourGEuCobhxkaMnJuCU=; b=HfTnlhl23TduooI8YHDcq0Qc46xWCrMev8N1r9PT3tLMUOszNJZlti56C1iVzrcud1 YYFqcp9//Dt2QB7ljBbHgalIhFHOlorSmpgp/ftxSGZGh6bvglZUXRnx1LbKGjiYrnQ0 x2R67JKhsmH2pfQcNMGo0oopDjPvbSczFxjZWdx4yNiCN+M3tGIau5yyrtzavf3PV1y6 lsutRGaIVkuiQ1g4iC7pZxi/26m3R0h6CTm6ImAAXZmeRkkxAaYvLOwZOJ2v58i2Tj2v gTQ+OERuCz/kXgCuyYDPjhi2KJWXB55cZoWbGlxNcnmHhl5uUK4YGexECrk8xaBbPmPi Yx3g== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Paul This reverts commit ccdae42575695ab442941310bd67c7ed1714e273. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/nouveau/nouveau_abi16.c | 6 ++++++ drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index e2bae1424502..94387e62b338 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -244,6 +244,12 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) return 0; } +int +nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS) +{ + return -EINVAL; +} + int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) { diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h b/drivers/gpu/drm/nouveau/nouveau_abi16.h index 70f6aa5c9dd1..195546719bfe 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.h +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h @@ -6,6 +6,7 @@ struct drm_device *dev, void *data, struct drm_file *file_priv int nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS); +int nouveau_abi16_ioctl_setparam(ABI16_IOCTL_ARGS); int nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS); int nouveau_abi16_ioctl_channel_free(ABI16_IOCTL_ARGS); int nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS); diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7e045580a3a4..551c4ee2ceed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -1047,7 +1047,7 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv) static const struct drm_ioctl_desc nouveau_ioctls[] = { DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), + DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_ALLOC, nouveau_abi16_ioctl_channel_alloc, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(NOUVEAU_CHANNEL_FREE, nouveau_abi16_ioctl_channel_free, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(NOUVEAU_GROBJ_ALLOC, nouveau_abi16_ioctl_grobj_alloc, DRM_RENDER_ALLOW),