From patchwork Sun Dec 31 18:15:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 10138303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF0D260362 for ; Sun, 31 Dec 2017 18:15:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD3FF28884 for ; Sun, 31 Dec 2017 18:15:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A167328887; Sun, 31 Dec 2017 18:15:22 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 EA09728884 for ; Sun, 31 Dec 2017 18:15:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 149628994D; Sun, 31 Dec 2017 18:15:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-x241.google.com (mail-qt0-x241.google.com [IPv6:2607:f8b0:400d:c0d::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id E8ECF8994D for ; Sun, 31 Dec 2017 18:15:18 +0000 (UTC) Received: by mail-qt0-x241.google.com with SMTP id d4so58962534qtj.5 for ; Sun, 31 Dec 2017 10:15:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=eSikHKXcYYyXlE3EsdZPMOIL481a0ECeRsfKVp46aH8=; b=O2Iufkc2SGc6ekcv+Np+zeH30wLpk9vsdnahlA5Aev0SX5XJSsvroD37frxBFDGQIN YPzqW6BLAB1RL0lFofqfpWl748iOe06qa6uOVp5QvEDfWUGUVP3P+KgcsmBrpm7MLrlV QoLCcptYX3Yka6b0Ct3zBnRAF3bkmY4jw4v403HbKgCMdgHiWWWLNEXgvCZqYV3NlLjM 41KNRUE76sLfOgc3LSxjqoL59arTnjAhyRPkpjrP8QfWg5f3VRYtVG4L+B72huIHygbV COgdAwXik+pE9NegH5mFzaD+K+snNgzcPf0DBXSq33qurpcftJ64NMdAWCC9u7oZCCNV nQwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=eSikHKXcYYyXlE3EsdZPMOIL481a0ECeRsfKVp46aH8=; b=Sdw3WZc/cA5mOPCkqSzFN3r0O/TAukih6CE/gMbgubF/zOAAdFLtw8HmL4Aro1TAHs HAx6Z4bQ3jblNAVoB9v7W9+xVkObXAsYGg/ZW8fLa5UNSW0PxzqB/Z0sRCoALlyZrk4u 9TEPjhFLHnlxWWv2JodJdB8JC/V/qwNh2FYUD1M1/UeFOqoPd9GmtmeBKYd4ADvWCTeO 3m1WMZLVhZxXyAmOlYBh19gsTODaXn51jor3Zr3eNal6k0y/ncsIWBfKkgLZeo7D81UB SKe4skrkYPt1S5ykGzWia+b5ncDDOHCPjnXoHiZHo6yGq9pABxakucct8b5u0y0m4DMh 1Kvw== X-Gm-Message-State: AKGB3mLb3iRKeWFm868qlw+fL9rqcLNCido0SZWlJ/E+JDsqTRazQqSR Wvt60lYU3d7l+HDDFWU4FvQ= X-Google-Smtp-Source: ACJfBou0Yi+PZQbD+xqs8dt2jcDz7G/SlO4mrc7BgjC5TftSt7wP8tGJyJJRRmYxPfVE7ynucoUK2g== X-Received: by 10.237.56.197 with SMTP id k63mr52965756qte.308.1514744118131; Sun, 31 Dec 2017 10:15:18 -0800 (PST) Received: from athos.fios-router.home (pool-100-2-1-206.nycmny.fios.verizon.net. [100.2.1.206]) by smtp.gmail.com with ESMTPSA id s12sm21589525qkl.82.2017.12.31.10.15.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Dec 2017 10:15:16 -0800 (PST) From: Ilia Mirkin To: Dave Airlie , Ben Skeggs , dri-devel@lists.freedesktop.org Subject: [RFC PATCH] drm: split up drm_ioctl to allow drivers to hook into "core" functions Date: Sun, 31 Dec 2017 13:15:09 -0500 Message-Id: <20171231181509.4429-1-imirkin@alum.mit.edu> X-Mailer: git-send-email 2.13.6 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP Currently there's no way to allow a driver to reimplement any ioctls from the drm core. This can be desirable to, e.g., override fixed format selection logic, without turning to a midlayer-like solution. Signed-off-by: Ilia Mirkin --- I want drm_mode_addfb to pick a different format for depth=30 than the one it currently selects. Flipping it for all drivers would break a bunch of existing ones, so this enables a driver to take control. Alternatively I can stash something into drm_device which specifies the preferred depth=30 fb format. However from my cursory observations of dri-devel discussions, midlayering is seen as a problem and not a solution. drivers/gpu/drm/drm_ioctl.c | 36 ++++++++++++++++++++++++------------ include/drm/drm_ioctl.h | 2 ++ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 4aafe4802099..698d69c6db0a 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -767,12 +767,7 @@ long drm_ioctl(struct file *filp, struct drm_file *file_priv = filp->private_data; struct drm_device *dev; const struct drm_ioctl_desc *ioctl = NULL; - drm_ioctl_t *func; unsigned int nr = DRM_IOCTL_NR(cmd); - int retcode = -EINVAL; - char stack_kdata[128]; - char *kdata = NULL; - unsigned int in_size, out_size, drv_size, ksize; bool is_driver_ioctl; dev = file_priv->minor->dev; @@ -784,16 +779,33 @@ long drm_ioctl(struct file *filp, if (is_driver_ioctl) { /* driver ioctl */ - if (nr - DRM_COMMAND_BASE >= dev->driver->num_ioctls) - goto err_i1; - ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; + if (nr - DRM_COMMAND_BASE < dev->driver->num_ioctls) + ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; } else { /* core ioctl */ - if (nr >= DRM_CORE_IOCTL_COUNT) - goto err_i1; - ioctl = &drm_ioctls[nr]; + if (nr < DRM_CORE_IOCTL_COUNT) + ioctl = &drm_ioctls[nr]; } + return __drm_ioctl(filp, cmd, arg, ioctl); +} +EXPORT_SYMBOL(drm_ioctl); + +long __drm_ioctl(struct file *filp, + unsigned int cmd, unsigned long arg, + const struct drm_ioctl_desc *ioctl) +{ + struct drm_file *file_priv = filp->private_data; + drm_ioctl_t *func; + unsigned int nr = DRM_IOCTL_NR(cmd); + int retcode = -EINVAL; + char stack_kdata[128]; + char *kdata = NULL; + unsigned int in_size, out_size, drv_size, ksize; + + if (!ioctl) + goto err_i1; + drv_size = _IOC_SIZE(ioctl->cmd); out_size = in_size = _IOC_SIZE(cmd); if ((cmd & ioctl->cmd & IOC_IN) == 0) @@ -851,7 +863,7 @@ long drm_ioctl(struct file *filp, DRM_DEBUG("ret = %d\n", retcode); return retcode; } -EXPORT_SYMBOL(drm_ioctl); +EXPORT_SYMBOL(__drm_ioctl); /** * drm_ioctl_flags - Check for core ioctl and return ioctl permission flags diff --git a/include/drm/drm_ioctl.h b/include/drm/drm_ioctl.h index add42809642a..e08f8ea66f2a 100644 --- a/include/drm/drm_ioctl.h +++ b/include/drm/drm_ioctl.h @@ -172,6 +172,8 @@ struct drm_ioctl_desc { int drm_ioctl_permit(u32 flags, struct drm_file *file_priv); long drm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +long __drm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg, + const struct drm_ioctl_desc *ioctl); long drm_ioctl_kernel(struct file *, drm_ioctl_t, void *, u32); #ifdef CONFIG_COMPAT long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);