From patchwork Wed Aug 7 14:20:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082257 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 C95EA912 for ; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7A3D1FE8D for ; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB71C28A21; Wed, 7 Aug 2019 14:21:17 +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 2D2A328A1B for ; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E0CB89622; Wed, 7 Aug 2019 14:21:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb42.google.com (mail-yb1-xb42.google.com [IPv6:2607:f8b0:4864:20::b42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3AF0389622 for ; Wed, 7 Aug 2019 14:21:15 +0000 (UTC) Received: by mail-yb1-xb42.google.com with SMTP id c9so4887662ybq.2 for ; Wed, 07 Aug 2019 07:21:15 -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=lI1zGJ+Zt8c98UTqq/Rr2tAZw/+25EjsPxHKnIbPXkU=; b=K8Hitie3knyKTzdRvldIfIaHlPkgAvy8QQGxaVpbBlpLJ7bRfJp18GUjBEVpJIz6FJ aM5cSuYDh8E8hui8NB0fz9g/OLrD553FhqsBHpq+6URqDNG1pvKSqF77P0TJw0nNh1Ib 4R1qkyAySm2D27uwk4NupPAYREe6jQH0+t8HJJKAmCMc5804bz/yMBPI9PjTIBKx1PSP UX9gI/h7lF5XQTOmwozY+o70anUOWB83vknjHOzXESaGB91PKVrh5asfqsip7nGnePjh jLPoo9qmrEDWyu8b8YhQ18eh9bL4X8rxEVACx1toQGsPumr2ISGS7x45UnbBcYj7ftWp nOJg== X-Gm-Message-State: APjAAAV3GlgQ1ph8ZQvL82dIrtDjkNNmR42AaM4lTb++koM10RQZCsYB qglyROM6Sm3gqGmqN5eizc70ePTx2N0= X-Google-Smtp-Source: APXvYqyKYAJVAKESLMMDLI1zap4etG+C9AjSzw2mblxI1/X53J3r42g6lNlLJuUZOrdgy4jG6gCoJA== X-Received: by 2002:a25:7545:: with SMTP id q66mr6313866ybc.327.1565187674164; Wed, 07 Aug 2019 07:21:14 -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.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:13 -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 1/5] Revert "Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()"" Date: Wed, 7 Aug 2019 10:20:54 -0400 Message-Id: <20190807142101.251400-2-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=lI1zGJ+Zt8c98UTqq/Rr2tAZw/+25EjsPxHKnIbPXkU=; b=bAXcwVqpZMRgxdbdyTn3snRXXud0IZFexhEnJ584tEgw9i0GvWvKsEinXHPwdEwe3R WG3lgRm0eM2iAls4EYxL+Tr5GSQ9oTI0o7Fd8ey3iNH0/pw3MGSa/h3/xQkf15RPu5eZ 0wSfuH5hvU/urxk7HZ7M1/m2urFmsb2Yy2cbqC88d/nCrb80qEpFASuQxdUvHUQW0nmQ xOzXVT6LlCxYMBUw42s6r8Er0RlQYh3KecpZ7uMvrC9PaL3bzaSeZq6ZhKmtBckaOufK r1mrnGqRWyO4meGPAqNdWNbyWenBR1HV+Jo2ol2fACwv7F2N5z6RCqivih5Z5bivzt4w Rgmg== 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 415d2e9e07574d3de63b8df77dc686e0ebf64865. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 10 +++++++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- include/drm/drm_gem.h | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c index d18a740fe0f1..b55cfc9e8772 100644 --- a/drivers/gpu/drm/drm_dumb_buffers.c +++ b/drivers/gpu/drm/drm_dumb_buffers.c @@ -48,7 +48,7 @@ * To support dumb objects drivers must implement the &drm_driver.dumb_create * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if * not set and &drm_driver.dumb_map_offset defaults to - * drm_gem_dumb_map_offset(). See the callbacks for further details. + * drm_gem_map_offset(). See the callbacks for further details. * * Note that dumb objects may not be used for gpu acceleration, as has been * attempted on some ARM embedded platforms. Such drivers really must have @@ -127,7 +127,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, args->handle, &args->offset); else - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); } diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index afc38cece3f5..8cbfd60e09c0 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -298,7 +298,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) EXPORT_SYMBOL(drm_gem_handle_delete); /** - * drm_gem_dumb_map_offset - return the fake mmap offset for a gem object + * drm_gem_map_offset - return the fake mmap offset for a gem object * @file: drm file-private structure containing the gem object * @dev: corresponding drm_device * @handle: gem object handle @@ -307,10 +307,14 @@ EXPORT_SYMBOL(drm_gem_handle_delete); * This implements the &drm_driver.dumb_map_offset kms driver callback for * drivers which use gem to manage their backing storage. * + * It can also be used by drivers using GEM BO implementations which + * have same restriction that imported objects cannot be mapped. The + * shmem backend is one example. + * * Returns: * 0 on success or a negative error code on failure. */ -int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, +int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev, u32 handle, u64 *offset) { struct drm_gem_object *obj; @@ -336,7 +340,7 @@ int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, return ret; } -EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset); +EXPORT_SYMBOL_GPL(drm_gem_map_offset); /** * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index d734d9d51762..bf0ad8e5a02b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -273,8 +273,7 @@ int exynos_drm_gem_map_ioctl(struct drm_device *dev, void *data, { struct drm_exynos_gem_map *args = data; - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, - &args->offset); + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); } struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp, diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index ae693c0666cd..0d6445fa9541 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -401,8 +401,8 @@ int drm_gem_fence_array_add(struct xarray *fence_array, int drm_gem_fence_array_add_implicit(struct xarray *fence_array, struct drm_gem_object *obj, bool write); -int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, - u32 handle, u64 *offset); +int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev, + u32 handle, u64 *offset); int drm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev, uint32_t handle); From patchwork Wed Aug 7 14:20:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082259 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 DA71E13A4 for ; Wed, 7 Aug 2019 14:21:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9188285B6 for ; Wed, 7 Aug 2019 14:21:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD41E289FC; Wed, 7 Aug 2019 14:21:24 +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 2FBD81FE8D for ; Wed, 7 Aug 2019 14:21:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B9386E70F; Wed, 7 Aug 2019 14:21:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) by gabe.freedesktop.org (Postfix) with ESMTPS id D74AA6E710 for ; Wed, 7 Aug 2019 14:21:21 +0000 (UTC) Received: by mail-yb1-xb41.google.com with SMTP id q5so20228610ybp.1 for ; Wed, 07 Aug 2019 07:21:21 -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=zAihxkfX9EywdeIr6db6fRkWBSNpTnefl57FhpwciLs=; b=QlO5NMq9xOwQeDYQitX8p+ZL0I8buMUiizZ5AtDu0MMtKwS5VRuRoFDZ7qxBF4hYJR F2Avv/ek0dCNIMfMx1k+D35D+1xPMRf0u1zWbMnRHAwVTKNzIMtH5XW2lMjYxiUxGPDG SEur28CUxhkDwVhdJqNyvY6JSWBRio7Jxx43eLc81RCAUuLkJPttxf0GwvFdyby5E7qh IKSsHDUz5Fnpy+qECEHH1RreRUhUNVW8arSwv9EwTOY7U4+K6nSc905RsKmHM125XmzT TPGnjC4r7piV/bBvwrQlqGBuCcEe/9X4qyyFSQwXbheL1o3JfvcYAb/8vWGm7o7w+vAu AJCA== X-Gm-Message-State: APjAAAUMx1K56XqpA/A2OtJIs0tZGA1AWx35NYgoM4SGrm2QPDzM0BKo vo+sJVl6vOm9ieu0dmWldIjbBF2W9OQ= X-Google-Smtp-Source: APXvYqztd/aFQeKsYeu8VeoPo7FAU5KUAL61J+4RFkygDdeG+R6cikuwGXewOwom6dzdq37mEv9Vxw== X-Received: by 2002:a25:3b56:: with SMTP id i83mr6536439yba.39.1565187680857; Wed, 07 Aug 2019 07:21:20 -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.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:20 -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 2/5] Revert "Revert "drm/panfrost: Use drm_gem_map_offset()"" Date: Wed, 7 Aug 2019 10:20:55 -0400 Message-Id: <20190807142101.251400-3-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=zAihxkfX9EywdeIr6db6fRkWBSNpTnefl57FhpwciLs=; b=BJfAGBUCOSWv1TPP1GouABQNDNNQr2dTG+rWAauDI+tcX5aeqQ3zoXDZMzAliPRw/U 0ruw++CCecpHSRWl4cn6F35oahceqIAcnGBW/PJ6VFi62EhT1iR+ftTfKX3IGGYV4c39 mjiQ0fWA3nT6JlIG3hmm+EU40ElwMnFm3mogo448hcoSKCvycWwZCsghZ9ReHwowVzHr yR6YAb08lLNe7Bw5pUvxvuCeX/YejiQcRYrsCXarZGxbDP2Z4z88IsX1XxVKDaAcnmXK 4twZkcdTb+ZnhNNw+tKaYSBwm2YslLtQrYfIx17B2LTHX3d8CRwKRip0Zydq21X0/VYz HF9A== 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 be855382bacb5ccfd24f9be6098d87acf4cfbb15. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index b187daa4da85..b2e325e270b7 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -291,26 +291,14 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_panfrost_mmap_bo *args = data; - struct drm_gem_object *gem_obj; - int ret; if (args->flags != 0) { DRM_INFO("unknown mmap_bo flags: %d\n", args->flags); return -EINVAL; } - gem_obj = drm_gem_object_lookup(file_priv, args->handle); - if (!gem_obj) { - DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle); - return -ENOENT; - } - - ret = drm_gem_create_mmap_offset(gem_obj); - if (ret == 0) - args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node); - drm_gem_object_put_unlocked(gem_obj); - - return ret; + return drm_gem_map_offset(file_priv, dev, args->handle, + &args->offset); } static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data, From patchwork Wed Aug 7 14:20:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082261 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 7A3B11399 for ; Wed, 7 Aug 2019 14:21:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69BDF20008 for ; Wed, 7 Aug 2019 14:21:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67BFD287A5; Wed, 7 Aug 2019 14:21:27 +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 28E7E28715 for ; Wed, 7 Aug 2019 14:21:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 429956E711; Wed, 7 Aug 2019 14:21:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC8F76E710 for ; Wed, 7 Aug 2019 14:21:23 +0000 (UTC) Received: by mail-yb1-xb41.google.com with SMTP id c9so4887931ybq.2 for ; Wed, 07 Aug 2019 07:21:23 -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=w6V1Lx0DBek9QfLDvX9mvikhi8Anr2icsXghXv2KTZM=; b=mTc/qtUw2Ljt1REfVL0/CKwfY5+1Vew+fOpxfjhSosysrnK2gt3/idZs4309P+0pR8 CHaLvj1TTNRAcKT+UtsA78yatI0/ZrgYSMpJN2aqhkoX0qZ+Cb5sfGdsxlJSE+iS7kXl S5vsejCcBE+cRk8Z1QU2G/B8Ln8KxzXJ9hTa7l05XPfEmfjBJwsFZog4r0nAoSgng4Xb WdSpT7leOe2zMypLcXkfszBYOJ7aXuSE2nL/G1Ls3+qDm88w4avV9PMx1zw0EgHykdkb DfyFcabc5slys2DPGf7gb81VfQz1JclGnxh3M+gOaFWXKe+jg/SatCnkJpMq5qrbtDCv Dvgg== X-Gm-Message-State: APjAAAXjOejoGsMJPzVMn3QnGan6PTJ78yHQ8CgGE9ZgADi5n/Jv3E9r xLoNzKsNOL1QR7XxxyyNA9+Tf+iV5vk= X-Google-Smtp-Source: APXvYqxRGLmm+SRsxIOFbKtzQiC8jJ1709Mxb3bD8GXt1RKXZnnLH+s9cmOSyyIpMlQyKBrLh2zLGw== X-Received: by 2002:a5b:90d:: with SMTP id a13mr6974442ybq.101.1565187682664; Wed, 07 Aug 2019 07:21:22 -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.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:22 -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 3/5] Revert "drm/vgem: drop DRM_AUTH usage from the driver" Date: Wed, 7 Aug 2019 10:20:56 -0400 Message-Id: <20190807142101.251400-4-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=w6V1Lx0DBek9QfLDvX9mvikhi8Anr2icsXghXv2KTZM=; b=Y/oA5i9JVyhfrnrrCc+Jj3pUWgytHtTDr4Lqn8ygu0qS/xjE+Y+j99c/yaFUOql94/ dV8cxKYZCJd8in62xmDxdbeNnHwWknTNFU8Zw9eC+/iYJDWL6F+PkU5J6oeg22kc281n /dA47Z2vgM4thiKN4opnNFXcr+kivixrn3lo8E3wji5y2Fk97dNGYS3G+CI+ihHhomWD fABNwo44KIjfSVS59e9U3PsX8rByKLwuRVxfZLAIdOwnCWQO+9XycBOseW/Nz39pe6x6 I5ugzp/rtxya8pai3oRO9fgrzFQRIZfwocOiAF5+14HpMDOd8cBH0Ya1TvHV/mwtak6c 1l/Q== 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 e4eee93d25776da998ec2dfaabe7d2206598d26d. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/vgem/vgem_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 5bd60ded3d81..1d0ccfcbc472 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -253,8 +253,8 @@ static int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev, } static struct drm_ioctl_desc vgem_ioctls[] = { - DRM_IOCTL_DEF_DRV(VGEM_FENCE_ATTACH, vgem_fence_attach_ioctl, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(VGEM_FENCE_SIGNAL, vgem_fence_signal_ioctl, DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(VGEM_FENCE_ATTACH, vgem_fence_attach_ioctl, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(VGEM_FENCE_SIGNAL, vgem_fence_signal_ioctl, DRM_AUTH|DRM_RENDER_ALLOW), }; static int vgem_mmap(struct file *filp, struct vm_area_struct *vma) From patchwork Wed Aug 7 14:20:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082263 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 EBF841399 for ; Wed, 7 Aug 2019 14:21:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8CAC28644 for ; Wed, 7 Aug 2019 14:21:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC85C28A2A; Wed, 7 Aug 2019 14:21:29 +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 6F9CB28644 for ; Wed, 7 Aug 2019 14:21:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F57288E33; Wed, 7 Aug 2019 14:21:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb43.google.com (mail-yb1-xb43.google.com [IPv6:2607:f8b0:4864:20::b43]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA1336E710 for ; Wed, 7 Aug 2019 14:21:25 +0000 (UTC) Received: by mail-yb1-xb43.google.com with SMTP id s41so10203267ybe.12 for ; Wed, 07 Aug 2019 07:21:25 -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=a+JE+XYSr4hrWGM0E5fzPKHjvNont2Ph+5BSjO+rqPo=; b=USWiLHxNs4qksbbj7LqtZH6MTInOSlgd/DDJpJ/YS8rIyqDGC4MQjq5Q0GKVczkcbi VzYwcSCejlJJ2eecM2abHN5EspF9z48kyGzeWjQwQQdTNee2qYt+fD1vb+IQG3CIdoru dJtnoXLNbGKunZyV0OANkCJQVsVecIAdopMVncFAUNa+tOgzH6lDsmxB4SkPMWr58sts scTIvMTfHpfAmqfMuyJnc+3ilcxJcQvf7nAF/6IZ/URNVussz6jZ3QPSczK46NSqxezA FokD11yLe/QRtAa3pw492NDCAc83l0kJ/v8A5KHjT4O8QZ62FMiT5vN0m+ALLa4TIstS uiSQ== X-Gm-Message-State: APjAAAUjlt3kI6SnsaPQl915HB8mu5uQW4O5Kli8g2gTHy0mj0jzWO0S oTO159kxe+WR0BkAQzCzv5IUQ43PE64= X-Google-Smtp-Source: APXvYqxaK//JKVcnPNwX7vyRuT0cMXrsViCFSQEO2vE09robUPPkzhwOixsUkwj906j8ArFAdC5rDA== X-Received: by 2002:a25:cc55:: with SMTP id l82mr6901462ybf.218.1565187684525; Wed, 07 Aug 2019 07:21:24 -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.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:24 -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 4/5] Revert "drm/msm: drop DRM_AUTH usage from the driver" Date: Wed, 7 Aug 2019 10:20:57 -0400 Message-Id: <20190807142101.251400-5-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=a+JE+XYSr4hrWGM0E5fzPKHjvNont2Ph+5BSjO+rqPo=; b=IAPkdTZE1e+AmuLU6yScuSsMbScIgzJnrOaOkRmR1SAVbqLhnQdf7yR8kASEeiOz39 xFI4ZyGIy9ItmUsrQzHZXyjuOltwYzGOb7saY35074AZENEpc4AxlUK9lfVeV+Fpo+Gn nOleXOCkRONctM8MMqpmhvYfWqVEIBaxM5CAWmCJ6qGEYsK9kBGLka6kD5LhiQR6fr8+ 5dGCxLcwlYt6PKNDyXuoOMqq5IH/ro059sbYwnKflhzMqvIyYLBVAOxvgv3LSRSG/OpO gBIup91iwb2e203PuYm/XPoiTs+ZrcynWEuHf1PAe5I4++OuAcn+xVAlykRp0Y0tPRlU BfPw== 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 88209d2c5035737f96bcfc2fd73c0fd8d80e9bf1. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/msm_drv.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index ea335ca25eca..abf8f4e4e543 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -984,17 +984,17 @@ static int msm_ioctl_submitqueue_close(struct drm_device *dev, void *data, } static const struct drm_ioctl_desc msm_ioctls[] = { - DRM_IOCTL_DEF_DRV(MSM_GET_PARAM, msm_ioctl_get_param, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_GEM_NEW, msm_ioctl_gem_new, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_GEM_INFO, msm_ioctl_gem_info, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_PREP, msm_ioctl_gem_cpu_prep, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_FINI, msm_ioctl_gem_cpu_fini, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_GEM_SUBMIT, msm_ioctl_gem_submit, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_WAIT_FENCE, msm_ioctl_wait_fence, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_GEM_MADVISE, msm_ioctl_gem_madvise, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_NEW, msm_ioctl_submitqueue_new, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_CLOSE, msm_ioctl_submitqueue_close, DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GET_PARAM, msm_ioctl_get_param, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GEM_NEW, msm_ioctl_gem_new, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GEM_INFO, msm_ioctl_gem_info, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_PREP, msm_ioctl_gem_cpu_prep, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_FINI, msm_ioctl_gem_cpu_fini, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GEM_SUBMIT, msm_ioctl_gem_submit, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_WAIT_FENCE, msm_ioctl_wait_fence, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_GEM_MADVISE, msm_ioctl_gem_madvise, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_NEW, msm_ioctl_submitqueue_new, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_CLOSE, msm_ioctl_submitqueue_close, DRM_AUTH|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_AUTH|DRM_RENDER_ALLOW), }; static const struct vm_operations_struct vm_ops = { 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),