Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To:     <dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
        <intel-gfx@lists.freedesktop.org>
CC:     David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
        "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Simon Ser <contact@emersion.fr>,
        Matthew Wilcox <willy@infradead.org>,
        Oded Gabbay <ogabbay@kernel.org>,
        =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        James Zhu <James.Zhu@amd.com>,
        Pekka Paalanen <pekka.paalanen@collabora.com>,
        Emil Velikov <emil.l.velikov@gmail.com>,
        =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v6 4/4] drm: Introduce force_extended_minors modparam
Date:   Mon, 24 Jul 2023 23:14:28 +0200
Message-ID: <20230724211428.3831636-5-michal.winiarski@intel.com>
In-Reply-To: <20230724211428.3831636-1-michal.winiarski@intel.com>
References: <20230724211428.3831636-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YVdQK1c4NFR5NWgrZTJWbDNGRXN5UTFQVDcrZWkzSXd5NUpELzJyczR6ODA4?=
 =?utf-8?B?UFhHMjVXb1NabnZvUmNnNG5FbENGSE1zak40Y3N5eGJ6TVNyQkVPMEpJWm5J?=
 =?utf-8?B?MHhJSmtBV2VDSURiVjNWcjhGZEFOUC92ZDdxRmc5T0hIWlpYdU0zOGRaWUIv?=
 =?utf-8?B?RUVrekFNMDdUOTVwaEF0SDlnZk1ReUhHVGRFYTdlTFhSbHdCRFdqbFl4K2g3?=
 =?utf-8?B?TGNudjEzVW0yZWNodVdmUEdBWDJ6cVRyU2cxNGxYLyt1K2dWVVdSN1g3YmRC?=
 =?utf-8?B?TUIxYU5PdlVWaGI0eWR3ajZ1M0w1U1RjMEI5bjZ2cFN1YXVwV0FsbDZYcjFJ?=
 =?utf-8?B?WTBrS1NMZHpHaW1HR1ZNVUF5L3dDU21EOEhoQ1pjWEZqekFzaGo3cVl4YVpV?=
 =?utf-8?B?UDJLbytCYk0rU1BaWHdXVGVyazZXcjN6b3RSYml2bzBDb0JDMnRqUXdjVXhk?=
 =?utf-8?B?anBVQVcweW1hcElNRG5iWlU1MVp6aWJWajhTbHdEUU9IRmd5VVFlYytGWEJo?=
 =?utf-8?B?VUZOdGVMdENsUzFDbmVpQVpUeXlIbXJwQkZ3OFZHN1VLNFRoVVI4OUVwTjR1?=
 =?utf-8?B?dnd5SnlWYzBiZzZSdE4vZEcvaUJIbExMb1NXVnozYWk2LzFFMlkzMWs0c3Jz?=
 =?utf-8?B?SS9pdjhUMTZiZmZja2pIb21JZU1hZ0EvVnVMTWVTTEk5bi9XTXIzdDJpKzQz?=
 =?utf-8?B?ZzBuVW1wTENtMlkvbTY5Um1wY2ljbmMxbnFCcHZiQjBLa254ZStmNEVQZ1BQ?=
 =?utf-8?B?RGFWQndKcFp2YjFUS1ZLUkpFNmhIekRhTzRQclRIMVpLQ2UvcmJZN2ZTUW1s?=
 =?utf-8?B?N2IwckpIU0NIVTRPOVp5STdwQjVsSG83VmQyeW9VY09aWTdaZVZpZ2Q0RFR5?=
 =?utf-8?B?bXhqaldHaW90N0I3dzJ3VGNUNHNobzl2KzFPRUNMRnpqbkxsbUUxTk1tdWlG?=
 =?utf-8?B?d09DSHFVSE5SQWg4WUgxbkdyZkRhelJmaTZrcE52S1AxQkdnVXpyL1IwYnAv?=
 =?utf-8?B?NHQrOGM5OHdaQy8zT1VDU2ZHcDBWZXRtMHJDaVNwMGpXQVVSbmt5Qk5CWXFx?=
 =?utf-8?B?RVg3d1lVYzV1bitWdkI0TFlZaWMyMHBvaGxoTEFnZEtoRlBBQUxxYjQwbHJx?=
 =?utf-8?B?bFNKL3grNVlWbHl3eXNNc3NsUzdqNjNHaCszTHY3RmlleGMwa2RJSFBHK3Ay?=
 =?utf-8?B?aUdYZUh2OEs5bGZ2V1pBV0lMbzNwZ21Bd2hiRjR4elNuczBEcFM1VnBENEdE?=
 =?utf-8?B?bHZqcUFmNXJpZDVzellyR1hCWFhGclhIa2YxeTRRNDlZTW5iaUhrTzNnNWxW?=
 =?utf-8?B?ZE9WRWZld1h1TnV3djJISnUybGlGdEYvNkpBYnp5TE80cVV1YWlQeHlSRG5B?=
 =?utf-8?B?QUtrZjRkNlc3cGlqNlZ0bWRXaExBN2VhUnhhRkV2ZGZkYWJuN1Q1a0NpRnFD?=
 =?utf-8?B?YzBCc2RmZ1dKeE1mU2NYdllwS2JEOFRqbjJFYUE1QzlIaW05cGtXcW9DL0Rp?=
 =?utf-8?B?aTdhTmR4UzBNaC9UaHlYbU52U2NIekZ6eXZMeXFOUDNjQmo3WG94YzU4REZP?=
 =?utf-8?B?VzlNRHY3NjgrN2I1ZndzV0U5b2gycjdkcjFBbDFDZEhHOEdJQnlWc0g0OFUx?=
 =?utf-8?B?cDlKMVNCRjBEemRmS0w2Ukg4eThnR3ZVS05OK3NVV2hhWm1tQnBPRmtxV3Vs?=
 =?utf-8?B?MHp3U3YyQVN4UmQ3bTloc2g3am0vYjBkaHhSTUxqaVUzRmRGblp2NnIrR2l3?=
 =?utf-8?B?azQzUEdhWUlRVVBDYitkUVlzRlgvblJ2Q3lZUFFqcDNNUTYxRnowZVBCR29M?=
 =?utf-8?B?bGlUWmtLcUVYSG1tVFJKVlI4SUdsMllMUGQ5dGNQQVhMUUM2OUJ5MjU3dEZ6?=
 =?utf-8?B?eGRBbmFPVTVrM3lEVmRSdG9pUjlJQ2J3SkVFK3FzTDR2STAxRG5YSzVOakdp?=
 =?utf-8?B?RkJTWVFFeWM0YnNFZm9YSk91cXIvZDFFNXA1ZmQ1S3VOeG9JQzlzSmllRVQ5?=
 =?utf-8?B?YUxKc0ZMcHNJT1FxRlliYlcvQWZ1MktaRUxjWENLa1Q3ajk1Z0VTeHYxMzFw?=
 =?utf-8?B?TjN0SFJJMlBmK3lkK1A3YklJMEYrcGZHbWRiaFRwenluUnB1TVJERnYwczB2?=
 =?utf-8?B?VUtac0VIa0tLWnM3bTlhNlJPN0RzM3c4Q1NhcnlaN0x1MlhZRG04Smw3TVlh?=
 =?utf-8?B?ZkE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f9106c75-42f6-481f-0320-08db8c8b1b64
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 21:15:29.2023
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UA/g8e58F49tcl/CsOVYBMorCL2mo3kzePvE0frBw5NNXnrGFixDsOn75g5nOzDNbzqkkXTvkQ8lmXJFeV9Um8ugr9LI7I4lGBtF+RYuYv4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR11MB5809
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

While there is support for >64 DRM devices on kernel side, existing
userspace may still have some hardcoded assumptions and it's possible
that it will require changes to be able to use more than 64 devices.
Add a modparam to simplify testing and development of >64 devices
support on userspace side by allocating minors from the >=192 range
(without the need of having >64 physical devices connected).

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 drivers/gpu/drm/drm_drv.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index c2c6e80e6b31..ef6d7b498784 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -57,6 +57,11 @@ MODULE_LICENSE("GPL and additional rights");
 
 DEFINE_XARRAY_ALLOC(drm_minors_xa);
 
+static bool force_extended_minors;
+module_param_unsafe(force_extended_minors, bool, 0400);
+MODULE_PARM_DESC(force_extended_minors,
+		 "Don't allocate minors in 0-192 range. This can be used for testing userspace support for >64 drm devices (default: false)");
+
 /*
  * If the drm core fails to init for whatever reason,
  * we should prevent any drivers from registering with it.
@@ -138,7 +143,7 @@ static void drm_minor_alloc_release(struct drm_device *dev, void *data)
 static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type)
 {
 	struct drm_minor *minor;
-	int r;
+	int r = -EBUSY;
 
 	minor = drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL);
 	if (!minor)
@@ -147,8 +152,9 @@ static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type)
 	minor->type = type;
 	minor->dev = dev;
 
-	r = xa_alloc(drm_minor_get_xa(type), &minor->index,
-		     NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL);
+	if (type == DRM_MINOR_ACCEL || !force_extended_minors)
+		r = xa_alloc(drm_minor_get_xa(type), &minor->index,
+			     NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL);
 	if (r == -EBUSY && (type == DRM_MINOR_PRIMARY || type == DRM_MINOR_RENDER))
 		r = xa_alloc(&drm_minors_xa, &minor->index,
 			     NULL, DRM_EXTENDED_MINOR_LIMIT, GFP_KERNEL);
-- 
2.41.0