From patchwork Tue Aug 29 05:30:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Ross Pollack X-Patchwork-Id: 13368594 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 DB481C83F12 for ; Tue, 29 Aug 2023 05:32:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C9B010E3B4; Tue, 29 Aug 2023 05:32:41 +0000 (UTC) Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2315710E3B2 for ; Tue, 29 Aug 2023 05:32:27 +0000 (UTC) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c1f8aaab9aso6754885ad.1 for ; Mon, 28 Aug 2023 22:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693287146; x=1693891946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GH6e/PDFX3J0yo9vZn0uCvm8FwvX/251scvS5l4WGCQ=; b=FdhT9fRBOFRjJrUeAuMpM9bqB8dz6ecrZz/QkAKojpSbvFqE7PdYSUR6XqNXWISkf4 m8OyNyX0dJSF45eMyHzYLujUC6H0xXrqZgY/ruDdDNoKzNQwgnnyyBuBI1v2jkXhmwwx TL5dc+qM0slXwiFiOu1SmqGOh0ZHEARQGJDKY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693287146; x=1693891946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GH6e/PDFX3J0yo9vZn0uCvm8FwvX/251scvS5l4WGCQ=; b=JL7SVO/+Adebzkquhlwke/C4ER9YbrJoO0CCD4Ok6Uw4ZSUpfHtrKrz3DIprE21GZh 97VQ+RFKw9G/I/zpfptlGSOZtWELFfcxO+uKYyMwdzaTBfzGXI9SMAnIaMCPflwt7vX1 vR2n24EVylMn0vPbh7D3fTbvuct6mPUZ+QzbrEgD2D+6vP44n4Kwrm82Mn1rrjUazI55 qEHluc4zzHbVsA+W590OSfITZjkRuyt4xi36UBdiwjwQsSILieV+uxk4kZrxW6yLiQ+X XsSXnlEqIngycGWl6j1T2EE9t62NL0ZrSo7V8Vz1xw+b9NxpD1wz8OaltoPsTGky2XGa cfQg== X-Gm-Message-State: AOJu0YxJ2JeXoWFR+bmLyJqvVOn5btKr89Uo+pO0y9uzydCGxeWHeTE7 Dm615W+hVqeUJswlHib41AwcVA== X-Google-Smtp-Source: AGHT+IFezZbao32Sth8G9Y+W8ekjiQQYamS+hSNT70TKkD7S/75DizVTlnq97IgsXaA2V7/WoMVgRg== X-Received: by 2002:a17:902:dac4:b0:1be:eef7:98e0 with SMTP id q4-20020a170902dac400b001beeef798e0mr32233232plx.35.1693287146640; Mon, 28 Aug 2023 22:32:26 -0700 (PDT) Received: from datalore.c.googlers.com.com (148.175.199.104.bc.googleusercontent.com. [104.199.175.148]) by smtp.gmail.com with ESMTPSA id g6-20020a170902c38600b001bdccf6b8c9sm8420874plg.127.2023.08.28.22.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 22:32:26 -0700 (PDT) From: Brandon Pollack To: marius.vlad@collabora.com, mairacanal@riseup.net, jshargo@chromium.org Subject: [PATCH v6 6/7] drm/vkms: Add a module param to enable/disable the default device Date: Tue, 29 Aug 2023 05:30:58 +0000 Message-ID: <20230829053201.423261-7-brpol@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829053201.423261-1-brpol@chromium.org> References: <20230829053201.423261-1-brpol@chromium.org> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, rodrigosiqueiramelo@gmail.com, linux-doc@vger.kernel.org, hirono@chromium.org, corbet@lwn.net, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, melissa.srw@gmail.com, mduggan@chromium.org, mripard@kernel.org, tzimmermann@suse.de, Brandon Pollack Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Jim Shargo In many testing circumstances, we will want to just create a new device and test against that. If we create a default device, it can be annoying to have to manually select the new device instead of choosing the only one that exists. The param, enable_default, is defaulted to true to maintain backwards compatibility. Signed-off-by: Jim Shargo Signed-off-by: Brandon Pollack --- drivers/gpu/drm/vkms/vkms_drv.c | 45 ++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index 6e7f20681890..293bebf8e8ce 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -42,17 +42,26 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 +static bool enable_default_device = true; +module_param_named(enable_default_device, enable_default_device, bool, 0444); +MODULE_PARM_DESC(enable_default_device, + "Enable/Disable creating the default device"); + static bool enable_cursor = true; module_param_named(enable_cursor, enable_cursor, bool, 0444); -MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); +MODULE_PARM_DESC(enable_cursor, + "Enable/Disable cursor support for the default device"); static bool enable_writeback = true; module_param_named(enable_writeback, enable_writeback, bool, 0444); -MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector support"); +MODULE_PARM_DESC( + enable_writeback, + "Enable/Disable writeback connector support for the default device"); static bool enable_overlay; module_param_named(enable_overlay, enable_overlay, bool, 0444); -MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support"); +MODULE_PARM_DESC(enable_overlay, + "Enable/Disable overlay support for the default device"); DEFINE_DRM_GEM_FOPS(vkms_driver_fops); @@ -99,6 +108,7 @@ static int vkms_config_show(struct seq_file *m, void *data) struct drm_device *dev = entry->dev; struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev); + seq_printf(m, "default_device=%d\n", enable_default_device); seq_printf(m, "writeback=%d\n", vkmsdev->config.writeback); seq_printf(m, "cursor=%d\n", vkmsdev->config.cursor); seq_printf(m, "overlay=%d\n", vkmsdev->config.overlay); @@ -297,10 +307,7 @@ void vkms_remove_device(struct vkms_device *vkms_device) static int __init vkms_init(void) { int ret; - struct platform_device *pdev; - struct vkms_device_setup vkms_device_setup = { - .configfs = NULL, - }; + struct platform_device *default_pdev = NULL; ret = platform_driver_register(&vkms_platform_driver); if (ret) { @@ -308,19 +315,27 @@ static int __init vkms_init(void) return ret; } - pdev = platform_device_register_data(NULL, DRIVER_NAME, 0, - &vkms_device_setup, - sizeof(vkms_device_setup)); - if (IS_ERR(pdev)) { - DRM_ERROR("Unable to register default vkms device\n"); - platform_driver_unregister(&vkms_platform_driver); - return PTR_ERR(pdev); + if (enable_default_device) { + struct vkms_device_setup vkms_device_setup = { + .configfs = NULL, + }; + + default_pdev = platform_device_register_data( + NULL, DRIVER_NAME, 0, &vkms_device_setup, + sizeof(vkms_device_setup)); + if (IS_ERR(default_pdev)) { + DRM_ERROR("Unable to register default vkms device\n"); + platform_driver_unregister(&vkms_platform_driver); + return PTR_ERR(default_pdev); + } } ret = vkms_init_configfs(); if (ret) { DRM_ERROR("Unable to initialize configfs\n"); - platform_device_unregister(pdev); + if (default_pdev) + platform_device_unregister(default_pdev); + platform_driver_unregister(&vkms_platform_driver); }