From patchwork Tue Sep 6 20:16:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 12968153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9265EECAAA1 for ; Tue, 6 Sep 2022 20:17:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 37F5210EA87; Tue, 6 Sep 2022 20:17:23 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CDDF10EA84; Tue, 6 Sep 2022 20:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662495432; x=1694031432; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=iK6yPR25uATbMq3cTWOhf01aAfkZS5uJ1mbTY5RiIY8=; b=Grx9gtgc1zAA4ESiFtY4wfa/2zqXFjxok9tQunwpq/9clQwFdJQMFyt5 g2fVX8J+BGjdebhQ1SdeG+k2vUU4ivG+HVSLlnZUb8BUUnHnnLOmo1HHf TBDsbA4QAAjVeSwxQKMTpe0LsYZTJwoaGVke3ukibUoysb6qyoRKH3fux ih8IDT8+67w9v7f2NEpokaswXQ74nViUKtfJw8cmZghq8G+OReLFnnZqS OpPbEzL+Xs6uxBUKffxeQmfV8HOQj3jU96J5FiABGN07R7zmevBtUJV+m lE+lzmK9YNEg1AEJqH9u3ENCkBMNJLWdjGlcan4t9E0KjDEE0RSydnyij Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="297479864" X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="297479864" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 13:17:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,294,1654585200"; d="scan'208";a="644310318" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga008.jf.intel.com with ESMTP; 06 Sep 2022 13:17:11 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 6 Sep 2022 13:17:11 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Tue, 6 Sep 2022 13:17:11 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.101) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Tue, 6 Sep 2022 13:17:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vmr4KAVsCQF0K86gc1O8Kp5BovAJhu3VQBcRnc2YGqS8gX23ASLCztSW9vPJyBIub+lAqVzLuWFc90iyxd4Gfa2wzjUsXb6ZLIBQUmZxndTbn5TnROxNOBKHJpvXmOViISl7GK9rWb4Bb9PT0aNdLEuHDm+5KfQqLqWMbHvsZyYuohLYlD3+7rvAfLLdJjwDOadITYCts6CJBWrtGN7BR2NJrVisGS3ZAHsN500cfEplFbXYdGBoRaF+B+uD9Vm7HPldYGXvYeUH/wL6rf4UoWsiYX2hRNdPIeHMnQQgviStkdDjPuGKBGx8ErFH4tEGCewy7M1BEeZJlK4dnG6xVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jNpp4W7B+QMMucoL1cm/W+GrHno4Qa9i5upw4eTjxa8=; b=Q/eUAxI6E2qniOTe/SnFVmG7k2xxNJGJA5DCKBTpnQzNg0P+1PtWK90QQvwxmGGxBo2WhUXZidbVXoJNHGRJQBkAl68AGptASpgvdfA0O+9VS3aW51azWREum9wK8sulVPWEokJ3wpPaJsjEZJSfpvAZu25FnjfMmt1/6mCn/N6I2jIPKrcvMR8WGKH9mtyKBzvkC9tqOr0eAQbRdFVhCm8K5tWG8GkoiJjKj9PzpUffkQe9kCLPyUUfLPkrgUbfM/VAgiLd0Zg5Yfo6pP9n9iV1yt1CYt8V8Uad9Obgy40qgbf3ykeFginuc8k6VImL4i4EtDnbjgktNQY4sIwuGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by CH0PR11MB5396.namprd11.prod.outlook.com (2603:10b6:610:bb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.12; Tue, 6 Sep 2022 20:17:08 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::b04c:807c:4ea0:c62e]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::b04c:807c:4ea0:c62e%9]) with mapi id 15.20.5588.018; Tue, 6 Sep 2022 20:17:08 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , Subject: [PATCH v4 2/3] drm: Expand max DRM device number to full MINORBITS Date: Tue, 6 Sep 2022 22:16:28 +0200 Message-ID: <20220906201629.419160-3-michal.winiarski@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220906201629.419160-1-michal.winiarski@intel.com> References: <20220906201629.419160-1-michal.winiarski@intel.com> X-ClientProxiedBy: FR3P281CA0104.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::20) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7766d86-eaa8-4c91-e8d8-08da9044c664 X-MS-TrafficTypeDiagnostic: CH0PR11MB5396:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PZmdh0lMpwED6tUD/c7qwyqcCcy+Ur6edetyEtXCGWB68Gf5jhyow1qQD4s8noEO0V7papYtL5wjfVi/Sbk+C9v/X78j5BnVbBLSvDqAz35iyU3wpgNTl/Iarl1SN1Tz0OWkzt+YbQzz1OeombVQ2n3N0rmvA2R6qwvAHc9eFy77jvY78/n0OdGNRQHqUFR27ZLaHjxIcw2/Qay7bOy0eCD1iSN9pnqlF7pL7vAgMJ8WDGJlbM+2yvmwFyLoB6vGmcBKfybf6Um/4GcL/jVVsfJeEV+lBguXd9pKkAY8ZpZb9skLyd7IVg6lWDsNGtqNN8GgyUGwQpK0GHpTqrnpa01bYKwDgzz+KJqDSv5jYRbk8lp+7a5PDPQALH52HpwRrxH5pSCDFZIRP4BsiakpAQOSQCnMSydhmGyQl2fL3jctqXEzHvLLVqIprn7Mumv/VkDyRJLiuNmLDqs0/keLVT+h9Hyuubooj+1l7NG/I4ijUcMmhZQF0bkZuGhH23st4QxRXUIyYhq44ZW0+iUyGP2HeaIWYitfH6H/rOpehPASSioxybnPFTGqUlSQkHoYMHVo2jEF6wk7uQzHFt8iFi5ihmEKAoRUeUY7w7CFIN2bDO2om8fPuePOKwoJz0cpOoRBDdTCX1MNc5/588ClsavsPqIvR/O9wwBn3U0th0yxp1bB36JW5TaDAJw/eq/N+OiellFuip0hFCv/nNGBBg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(376002)(396003)(346002)(136003)(39860400002)(366004)(316002)(54906003)(86362001)(82960400001)(36756003)(2906002)(38100700002)(5660300002)(8936002)(7416002)(66946007)(4326008)(66476007)(83380400001)(8676002)(6512007)(6486002)(2616005)(6666004)(186003)(1076003)(6506007)(478600001)(66556008)(41300700001)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0aIT6gKAfWeGsHKA6n8eqkj/YbzS?= =?utf-8?q?5o6cHpyNtZqXxAC6wmfFA5PsZGNlBrpkp7Zojo+byfGxYUgn21hjxYEUlJzElrre5?= =?utf-8?q?O3QnOIk6PJuOTmrP78urdw+VNq5Qaku1N3LMW4k/1L3+pjljDRC0PY3kyt9njset4?= =?utf-8?q?slhUuwW7NEHyv/g2GokEihe1xTK6ZRcvxmraKwCCFoMcYTSBF77ivdtD8Xohs8a4M?= =?utf-8?q?zFyhJA30Jh8peHc2eVBoWOF4LzVXARnDifkvs6i9vJ0CArgZGZG1OwXQf7JSM6iqb?= =?utf-8?q?H1ZQnCe/FKmooWvUzF9+wtXSVKwmBem2zKKtf8UVqyYsqiNSDRMQZdN+Q9EIoJK/i?= =?utf-8?q?ebvbs3bKf32mMJQYNj3w/i57rmMEtTCd+jXZPnzIbvtNlE5kQpgoP4XPKbJFbd9aI?= =?utf-8?q?c0xjsuYdi/AFkq1oZHuHIoh5Nz7zsVFNE+x3uR0WO+cgRYsaA4Un0VDPy+sCCGTod?= =?utf-8?q?lro0r+h+JKbcs1jSb9KxqGRVX/39Tjix4NLjo70qEo1cKx3nnMSxEnJjwYmqkyw8A?= =?utf-8?q?MlH5lbduICsxYQCP5OUY2UZtUW+R37tFC0w5MswWObC/nkvGCIdMnN0mPSAS0TrM4?= =?utf-8?q?F03b0mnRyt1pu+zFlB2pVeoF/8AOuZAPd2cjB6w/7nuTpGfMfVB9G2dkOz5+G3U/X?= =?utf-8?q?EllDHjKUFNzBYmteXshAMwvgyziuWmJXr0nMmyKWTogtro/rhQ5gxNmmHIRxwwJIM?= =?utf-8?q?eH2iu0JuuATB0Px0VXE4Tg4Ivl7Wl3bt18uPwFfz76qWG1ES0MxPbdM8AoElcSerg?= =?utf-8?q?JmYry8ZxobG9lRjHIgJz7YTTBc1cR+ERygqKvJUdlk1OqzbMdfGg1KAf9dYAPU9hE?= =?utf-8?q?K548B6uTmwNW46GF6kDMZWOtqEKFrBUvRaCWplbPoRjdkKDT56qK6PJXP7Y1tMNh3?= =?utf-8?q?h2BsHYKze7SziDiUAgym815LZPix6EWb9sPAd1SQGTgtaj7rhbClszJzSCFRNzJyh?= =?utf-8?q?bHzXmO+ph5+pLGeNgNh9uvAo2DyFoR9LtGBo6DrCrakL6si+AmDRDSHvKzGkl7Yrd?= =?utf-8?q?ZbRWwyiXGH9lC7Vg/MXRaBLsEQ0J+Zsj4uBMjqN4XbTTukd/WpF1zuXXOZJA8CJtm?= =?utf-8?q?Kt9Umi1R4rNS4h0k/oNgKZGFMIuMcast3cycnuda+nhdis7cVSM/JisM/5IDq29Jf?= =?utf-8?q?7CjkA9fSh8gIkDnD6DHLRfybIsAt1OzZOPtcO37G1oK13JRRziWzDZCpVuPyo9YaO?= =?utf-8?q?nSSdeEvN4aXtFOeRGdTl4bxJNo1ZQDLAcfeDtDyVYLV+bs5lFXlXe48ZPifX1PESE?= =?utf-8?q?JzzKmBOtgRWvw4g1M+3Rawm4TyfWXLAPl75Bamj+crNh9l2pRftUaPEv0ycINNXNE?= =?utf-8?q?stbCHsS8MCyNNECrzvcJz3ErdQyUOSclfz5RpN7kYy6s6JdAurNjnVIYd01WtC1mR?= =?utf-8?q?PKYfxra1L2YZiRGh/tv5eSnzqXv7XGpXA7pCk/BFcDcgeNE+Nm+qFw0vq7yolCMZj?= =?utf-8?q?dxCrF3YZMeYTxDa6VMl+VHUHTNSPgH1v4QHs1TxUISsKzdXCf2jPsDg0g44sMP1md?= =?utf-8?q?oOvK9ABCqh+OfVu5QrT+5SnVljV7JDYbFg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: b7766d86-eaa8-4c91-e8d8-08da9044c664 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 20:17:08.8274 (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: CdEI5dOPnaXmGTrjwQEVdOH7gZHr58tqC7wdmp+9uRVzmb5dZe1ZMuckcl+nb2H5z8pMJO73TlD6ZDdqvXqK4UwcjIUvAymhs7kO/gaQK0M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5396 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Micha=C5=82_Winiarski?= , David Airlie , Matthew Wilcox , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Having a limit of 64 DRM devices is not good enough for modern world where we have multi-GPU servers, SR-IOV virtual functions and virtual devices used for testing. Let's utilize full minor range for DRM devices. To avoid regressing the existing userspace, we're still maintaining the numbering scheme where 0-63 is used for primary, 64-127 is reserved (formerly for control) and 128-191 is used for render. For minors >= 192, we're allocating minors dynamically on a first-come, first-served basis. Signed-off-by: Michał Winiarski --- drivers/gpu/drm/drm_drv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 41799e4d0432..2c6e0b8d3b7a 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -119,8 +119,17 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type) minor->type = type; minor->dev = dev; + /* + * DRM used to support 64 devices, for backwards compatibility we need to maintain the + * minor allocation scheme where minors 0-63 are primary nodes, 64-127 are control nodes, + * and 128-191 are render nodes. + * After reaching the limit, we're allocating minors dynamically - first-come, first-serve. + */ r = xa_alloc(&drm_minors_xa, &id, NULL, XA_LIMIT(64 * type, 64 * (type + 1) - 1), GFP_KERNEL); + if (r == -EBUSY) + r = xa_alloc(&drm_minors_xa, &id, NULL, + XA_LIMIT(192, (1 << MINORBITS) - 1), GFP_KERNEL); if (r < 0) return r;