From nobody Thu Dec 18 16:51:31 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2635EE49B0 for ; Thu, 24 Aug 2023 08:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240606AbjHXIpU (ORCPT ); Thu, 24 Aug 2023 04:45:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240620AbjHXIpD (ORCPT ); Thu, 24 Aug 2023 04:45:03 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB55219AD for ; Thu, 24 Aug 2023 01:44:40 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2680eee423aso3682903a91.2 for ; Thu, 24 Aug 2023 01:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1692866680; x=1693471480; 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=UibU+Wd31ET9DKxhDYToQOnKhMNxhV0MyhlXlmFI9GI=; b=YHo02qxMi64msVO+7UMM7l8e9W3mPRNZpEcvc8FFufBNFJEHdfKrK0wZWhsZQgld3k 1SYtyo63iJFqaHbev0Ugi/tdDDNOX3eIf621djNs2Q+4JnXGiWJKvtb94w5RRPC9Iyb/ wrPntZcYzZpIHGgfWfhdsVjK0YiH+NN+nGGd0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692866680; x=1693471480; 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=UibU+Wd31ET9DKxhDYToQOnKhMNxhV0MyhlXlmFI9GI=; b=TgqqaqnYldnAAij7e2Ngvn3YwehIjN3lbaHvK2yWJ0bkNsyTdEKYrbD144Fj8Imfbo sJmwSS2mh1ck6Byo/elBitjyFLONVAI/4IiseXo9Z+QkxzlypD90R3kEw53QvA+IjJ4Z kHyBiiw2hMbBx1N0UcCyJcFeAF92ZzjzHU3KwJjH13rDT9Rz4BZHtRqKW7qTRvcbhqEo +C0xQdHg09+51rc29aDnV/eSaW8am0krO23jNGS2OKlqsYG5INhxMdhvWAI83OTZ4mry H7h6oEHR50STUL8Aql9aEWc04Xo7xTPWRjRA7HlvqrmvHvuXwh2afw68WToGjnTeGzC0 ieaA== X-Gm-Message-State: AOJu0Ywr/NU7aGXrWlzsdHfnZl/sfNEqFdT6McQQhU73oRCntO/aA+px uld1xJ8OkZAP/HXvR2cSwwzPdw== X-Google-Smtp-Source: AGHT+IFwpaNTNsORjA+hNNZO0C8AtRGFbppgjjAZ6BMplBapQU30frf6aN8ELJRkTA/7CvIBhx4aaw== X-Received: by 2002:a17:90b:1e0b:b0:268:5d00:3751 with SMTP id pg11-20020a17090b1e0b00b002685d003751mr11226477pjb.10.1692866680203; Thu, 24 Aug 2023 01:44:40 -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 12-20020a17090a194c00b00268188ea4b9sm1150216pjh.19.2023.08.24.01.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 01:44:39 -0700 (PDT) From: Brandon Pollack To: marius.vlad@collabora.com, jshargo@chromium.org Cc: corbet@lwn.net, dri-devel@lists.freedesktop.org, hamohammed.sa@gmail.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, mairacanal@riseup.net, melissa.srw@gmail.com, mripard@kernel.org, rodrigosiqueiramelo@gmail.com, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mduggan@chromium.org, hirono@chromium.org, Brandon Pollack Subject: [PATCH v4 6/7] drm/vkms: Add a module param to enable/disable the default device Date: Thu, 24 Aug 2023 08:40:37 +0000 Message-ID: <20230824084350.1062579-7-brpol@chromium.org> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog In-Reply-To: <20230824084350.1062579-1-brpol@chromium.org> References: <20230824084350.1062579-1-brpol@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_dr= v.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 =20 +static bool enable_default_device =3D true; +module_param_named(enable_default_device, enable_default_device, bool, 044= 4); +MODULE_PARM_DESC(enable_default_device, + "Enable/Disable creating the default device"); + static bool enable_cursor =3D 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"); =20 static bool enable_writeback =3D true; module_param_named(enable_writeback, enable_writeback, bool, 0444); -MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector sup= port"); +MODULE_PARM_DESC( + enable_writeback, + "Enable/Disable writeback connector support for the default device"); =20 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"); =20 DEFINE_DRM_GEM_FOPS(vkms_driver_fops); =20 @@ -99,6 +108,7 @@ static int vkms_config_show(struct seq_file *m, void *da= ta) struct drm_device *dev =3D entry->dev; struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); =20 + seq_printf(m, "default_device=3D%d\n", enable_default_device); seq_printf(m, "writeback=3D%d\n", vkmsdev->config.writeback); seq_printf(m, "cursor=3D%d\n", vkmsdev->config.cursor); seq_printf(m, "overlay=3D%d\n", vkmsdev->config.overlay); @@ -297,10 +307,7 @@ void vkms_remove_device(struct vkms_device *vkms_devic= e) static int __init vkms_init(void) { int ret; - struct platform_device *pdev; - struct vkms_device_setup vkms_device_setup =3D { - .configfs =3D NULL, - }; + struct platform_device *default_pdev =3D NULL; =20 ret =3D platform_driver_register(&vkms_platform_driver); if (ret) { @@ -308,19 +315,27 @@ static int __init vkms_init(void) return ret; } =20 - pdev =3D 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 =3D { + .configfs =3D NULL, + }; + + default_pdev =3D 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); + } } =20 ret =3D 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); } =20 --=20 2.42.0.rc1.204.g551eb34607-goog