From patchwork Sun Mar 16 13:43:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3839141 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 665219F369 for ; Sun, 16 Mar 2014 13:43:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 49DE820240 for ; Sun, 16 Mar 2014 13:43:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EC0182022F for ; Sun, 16 Mar 2014 13:43:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E16E89A4B; Sun, 16 Mar 2014 06:43:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by gabe.freedesktop.org (Postfix) with ESMTP id F143189A4B for ; Sun, 16 Mar 2014 06:43:41 -0700 (PDT) Received: by mail-bk0-f52.google.com with SMTP id my13so321025bkb.39 for ; Sun, 16 Mar 2014 06:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vVFzRqX0Zq+D5mz8aVQUz08OIY3qY2DkytITB6ACwms=; b=ZjsZIcnB3OlT+LtPocLqPfD3WnNuVC7m2LoDWGqWBPrek7ubXvgjCuMeqyg26mZFZA S4g3Do6TMaxa1aPCHJJhSwejcBumVZYEJfeinORRnj620UJGk8MdNMDB3CDezDGgB05d A8yU+nJlfBbCbWGcwAEH6Ki+3+fRYdc06i0TC6mNtjRwMIFdOzf2ry4pvKXwnvdBEoXH N6Rpn7P/nub81asc0IGoFzEdx6K2Aq84bDxt0siVwNEuJtv2O/Wn+tJDYh6w5MyB6qfX g67WogY3SA83vxrNzKghKHtTaj0qoX+zoDxZ2eVNiqnL1OcsIOljPDiqjEvJefzgcXQ1 zyjw== X-Received: by 10.204.167.199 with SMTP id r7mr49541bky.63.1394977417163; Sun, 16 Mar 2014 06:43:37 -0700 (PDT) Received: from david-tp.localdomain (stgt-5f71837b.pool.mediaWays.net. [95.113.131.123]) by mx.google.com with ESMTPSA id v12sm10869355bko.17.2014.03.16.06.43.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Mar 2014 06:43:36 -0700 (PDT) From: David Herrmann To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: enable render-nodes by default Date: Sun, 16 Mar 2014 14:43:20 +0100 Message-Id: <1394977400-10465-1-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.0 Cc: Daniel Vetter , linux-kernel@vger.kernel.org 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 We introduced render-nodes about 1/2 year ago and no problems showed up. Remove the drm_rnodes argument and enable them by default now. Signed-off-by: David Herrmann Acked-by: Daniel Vetter --- Hi Dave This does _not_ depend on the "drm-minor" branch. We decided to not provide reliable minor-numbers. User-space should just properly enumerate devices instead of relying on some minor-math-magic. Furthermore, so far no-one complained about any render-node issues, so I don't think there's any reason to keep them experimential. Thanks David drivers/gpu/drm/drm_stub.c | 7 +------ include/drm/drmP.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 98a33c580..be3ad89 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -40,9 +40,6 @@ unsigned int drm_debug = 0; /* 1 to enable debug output */ EXPORT_SYMBOL(drm_debug); -unsigned int drm_rnodes = 0; /* 1 to enable experimental render nodes API */ -EXPORT_SYMBOL(drm_rnodes); - unsigned int drm_vblank_offdelay = 5000; /* Default to 5000 msecs. */ EXPORT_SYMBOL(drm_vblank_offdelay); @@ -59,13 +56,11 @@ MODULE_AUTHOR(CORE_AUTHOR); MODULE_DESCRIPTION(CORE_DESC); MODULE_LICENSE("GPL and additional rights"); MODULE_PARM_DESC(debug, "Enable debug output"); -MODULE_PARM_DESC(rnodes, "Enable experimental render nodes API"); MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs]"); MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]"); MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps"); module_param_named(debug, drm_debug, int, 0600); -module_param_named(rnodes, drm_rnodes, int, 0600); module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600); module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600); module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600); @@ -533,7 +528,7 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto out_unlock; } - if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) { + if (drm_core_check_feature(dev, DRIVER_RENDER)) { ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER); if (ret) goto err_control_node; diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 04a7f31..5c91f1f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1448,7 +1448,6 @@ extern void drm_master_put(struct drm_master **master); extern void drm_put_dev(struct drm_device *dev); extern void drm_unplug_dev(struct drm_device *dev); extern unsigned int drm_debug; -extern unsigned int drm_rnodes; extern unsigned int drm_vblank_offdelay; extern unsigned int drm_timestamp_precision;