From patchwork Wed Mar 30 09:45:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694561 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 395E89F44D for ; Wed, 30 Mar 2016 09:46:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 600E820379 for ; Wed, 30 Mar 2016 09:46:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 923DC2035D for ; Wed, 30 Mar 2016 09:46:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED5A26E756; Wed, 30 Mar 2016 09:45:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19E306E755 for ; Wed, 30 Mar 2016 09:45:32 +0000 (UTC) Received: by mail-wm0-x235.google.com with SMTP id 127so89995649wmu.1 for ; Wed, 30 Mar 2016 02:45:32 -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=pbCH/WMEqYyAr9nP8jGywG2P7btqgDh7onoRdYECc5g=; b=X55U9SYMiUGJoFPcsufY7f1aG72VzCXUkeLLhwg69A0VIDR+B2780l95wQAwmZa7e6 mXUCwUtjh+9HaDpddQrZsomY4j/SeqmQhT44HdVTNi5px7lloTxmtN9JwFhFJiZ5k2Jo y3C8uzjp2JuqUwiZW+vioMG46uxdPWPEszIuw= 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=pbCH/WMEqYyAr9nP8jGywG2P7btqgDh7onoRdYECc5g=; b=RWSYPony14Z/t7Gj1mRWGrkdr6td1tCUfJt5k93Uz1xs+enko08PUI7vP7WehfzJsd KcU7NzlQCnrmfwBxM3MFi0jrGjaSuxrB5ZjwUWlVryLhBv8hg8CD6Ni6wpojWbcFHO95 pwHreRELidUDYjKth9Iat8D901fwd+1Lghy6knDnkalkDWJSYQ9P3mFAAyfYebJhQRg6 xv9EhgGh9qRw2mnpORI4jTedfsMRYU19cWgsma5QbGEBoQ49bXjjpo20WepWNhIxpAW6 3u4FbD7IjwLiRstbLWJF8m4a2mFftpCRokLaNfCqiXLqoz9gZVTLJsGv/Iq3xX8sKghN Fxzg== X-Gm-Message-State: AD7BkJJi/Dwz9bHMwbrMr7vVXqDxU8i6imksRPvBCo/wWzxTwDn28knU7YK6wGIXN8bnoQ== X-Received: by 10.194.84.2 with SMTP id u2mr8246619wjy.61.1459331128958; Wed, 30 Mar 2016 02:45:28 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id m130sm1905493wmf.10.2016.03.30.02.45.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:45:28 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 08/10] drm: Forbid legacy MAP functions for DRIVER_MODESET Date: Wed, 30 Mar 2016 11:45:18 +0200 Message-Id: <1459331120-27864-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459331120-27864-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development , Peter Antoine , Ben Skeggs 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-Spam-Status: No, score=-5.1 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 Like in commit 0e975980d435d58df2d430d688b8c18778b42218 Author: Peter Antoine Date: Tue Jun 23 08:18:49 2015 +0100 drm: Turn off Legacy Context Functions we need to again make an exception for nouveau, but everyone else really doesn't need this. Cc: Peter Antoine Cc: Ben Skeggs Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_bufs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index d92db7007f62..e8a12a4fd400 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -396,6 +396,10 @@ int drm_legacy_addmap_ioctl(struct drm_device *dev, void *data, if (!(capable(CAP_SYS_ADMIN) || map->type == _DRM_AGP || map->type == _DRM_SHM)) return -EPERM; + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && + drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + err = drm_addmap_core(dev, map->offset, map->size, map->type, map->flags, &maplist); @@ -438,6 +442,10 @@ int drm_legacy_getmap_ioctl(struct drm_device *dev, void *data, int idx; int i; + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && + drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + idx = map->offset; if (idx < 0) return -EINVAL; @@ -569,6 +577,10 @@ int drm_legacy_rmmap_ioctl(struct drm_device *dev, void *data, struct drm_map_list *r_list; int ret; + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT) && + drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + mutex_lock(&dev->struct_mutex); list_for_each_entry(r_list, &dev->maplist, head) { if (r_list->map &&