Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5846052rdb; Thu, 14 Dec 2023 00:51:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHCgIWzlZ0RFe+kDUmPGe+NQajlYiEdI9YyAv9HH7YOkMJ4qDMmyjpfNBuaXUCWywBL0IkE X-Received: by 2002:a17:902:a3c8:b0:1d3:64fc:7958 with SMTP id q8-20020a170902a3c800b001d364fc7958mr1029515plb.31.1702543873641; Thu, 14 Dec 2023 00:51:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702543873; cv=none; d=google.com; s=arc-20160816; b=Bzah1iLVJxAiuME4lCoBQoJMjKYt2JEV5H1l6ppRVjPEVQhUFRro8IQmjpOljScPVa SxBQN+TZ0GQAHAUtfJRPvpEZ9gwIkpjhAxxO83awNUwAUV54GZQVCZol5DtFbs25A1jm Wc7zUzjV88n9zODmYj7Mh1PzPT3s45DBzQupxMOEy3eko76xd0zBj811UDFU2ELPlQxU ZgRFgY2hsK5+5e/j2DzKwamH868gx30SGfHOuTbL9YCfizFfQPQ2N9shUMYoevpkUlme LeJWQ67UDxubg29baEKBsV0XVMQdTiN0u+K1uX3KejDc79UwPLIZvMK5+Kbs5gpW6hS6 Pxug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=3OlTPqlli2uCG1E/b+wjlxbRhYFvKODMjutJLmsxab0=; fh=s2ufp5odxBiVI1DugGmR9pnJ96PDI7y2LhWfMqzKBMk=; b=rOV/GqRXLrozhRjFCpxCQCyQG1seTVRo+Xg12YOpY4EJPhEi8t1jflJ62idIHGU279 bbESZvtaQ90ktxUfkqZs9hYR5y0hXJ1TNjxttVluw7RSyI0VhsJu1qFzZ+YS/fua1r/v gxjzFjKVsIPKOcI8RozBcITlQpU4Dt6w/w2kSeBltchhz1wRT8wv+j6YPB1Buf9jWx0U Ja2sTPi2XUrmXP1RIeLisYS4yMj3Kc2k86d0a7kU7HPxSZwsTaDqewgZRBo9d3cZPlpr UKXw5lUVjLyb+B1IrJbHKpjVbqOHNy9NtNpi2O1QfDNahq/cOCegc11f1KG5sDYsJeW+ 48Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=bTn6W0H2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id iw7-20020a170903044700b001d3535e0c5asi815685plb.470.2023.12.14.00.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 00:51:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=bTn6W0H2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 71CE68085FA2; Thu, 14 Dec 2023 00:50:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443436AbjLNIuE (ORCPT + 99 others); Thu, 14 Dec 2023 03:50:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443452AbjLNItx (ORCPT ); Thu, 14 Dec 2023 03:49:53 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFB8811B for ; Thu, 14 Dec 2023 00:49:58 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-dbcc50d7dd3so2360499276.2 for ; Thu, 14 Dec 2023 00:49:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1702543798; x=1703148598; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3OlTPqlli2uCG1E/b+wjlxbRhYFvKODMjutJLmsxab0=; b=bTn6W0H2un/UrpbYru9M2NKox2ChTjwRO0EtM78EaaKaJm6EIOM1H/kueNK2ApH0Dn ET8BHm4hdPyim67TZ08fFqna4qZOA67ILFetdp1Qnp605MnLLg0Dz0fuTHhzOkoEFddy ktGbX53nlxc5RFUcmS2NtRsyJpa4eZXTuvDXdbU+xapYrwIXjpq1dgksborzldLqojyX /1viJoOJ2boCzdi/+B0Cdrgha/YFj8aGtmjH+5t3VrLbcnb06kYjp2J39hMKDtSYjgtK ATGfEOn1IrHjopKjhPcojcBc8NUxIWan2xkqxZKEoJBaZaG12iyScJLNDL5J6oY2K+8h cRuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702543798; x=1703148598; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3OlTPqlli2uCG1E/b+wjlxbRhYFvKODMjutJLmsxab0=; b=nFEFVPXDy+NWSJ1jAQQ+cpDiqEHPRBaLAw/b6q98dJF1CmRPQKpXTh7BBFihByJ/Cq fWIXeVU3NEmgW2jdtqm+YjluwqaUYTFRrZurFy+7z/w7igfgevcCXGyBpR4G2r6yQWC0 klPoex+N0nKiqluvM/Kv9uTMBJpPHxrRY7eXbSduMKJNflCHJlrbHd0YpkYsisS4yMwO jjLuJCf89CpZb7o5m/sAnUF/uwyJiwQGhAXTAkUyiVxExApTraZj5t3OZBleHWKe8Dey DxY3tIz9C2Gc5sOe49ha9H/tNqO4ilZGMjCE60ByGUewAfVRgC4qvf0DmEN/DZhk4f+y 3c6Q== X-Gm-Message-State: AOJu0YxcaCT9oYg3ydCs05PyRcFjjHzSM6JkRXeKbnyTnSpcMLUeLyIx IdW3Q50rjg54bBdC0aiL5Ycw4ibSF+0rCg== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a25:3103:0:b0:dbc:cf6d:9a50 with SMTP id x3-20020a253103000000b00dbccf6d9a50mr41005ybx.10.1702543798003; Thu, 14 Dec 2023 00:49:58 -0800 (PST) Date: Thu, 14 Dec 2023 16:49:19 +0800 In-Reply-To: <20231214-kunit_bus-v3-0-7e9a287d3048@google.com> Mime-Version: 1.0 References: <20231214-kunit_bus-v3-0-7e9a287d3048@google.com> X-Mailer: b4 0.13-dev-099c9 Message-ID: <20231214-kunit_bus-v3-5-7e9a287d3048@google.com> Subject: [PATCH v3 5/5] drm/tests: Switch to kunit devices From: davidgow@google.com To: Rae Moar , Brendan Higgins , Greg Kroah-Hartman , Matti Vaittinen , Stephen Boyd , Shuah Khan , Jonathan Corbet , Kees Cook , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Maxime Ripard Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-sound@vger.kernel.org, David Gow , Maxime Ripard Content-Type: text/plain; charset="utf-8" X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 14 Dec 2023 00:50:41 -0800 (PST) From: Maxime Ripard Kunit recently gained helpers to create test managed devices. This means that we no longer have to roll our own helpers in KMS and we can reuse them. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/tests/drm_kunit_helpers.c | 66 ++----------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c index c251e6b34de0..ca4f8e4c5d5d 100644 --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -15,28 +16,6 @@ static const struct drm_mode_config_funcs drm_mode_config_funcs = { }; -static int fake_probe(struct platform_device *pdev) -{ - return 0; -} - -static struct platform_driver fake_platform_driver = { - .probe = fake_probe, - .driver = { - .name = KUNIT_DEVICE_NAME, - }, -}; - -KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_driver_unregister, - platform_driver_unregister, - struct platform_driver *); -KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_device_put, - platform_device_put, - struct platform_device *); -KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_device_del, - platform_device_del, - struct platform_device *); - /** * drm_kunit_helper_alloc_device - Allocate a mock device for a KUnit test * @test: The test context object @@ -54,34 +33,7 @@ KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_platform_device_del, */ struct device *drm_kunit_helper_alloc_device(struct kunit *test) { - struct platform_device *pdev; - int ret; - - ret = platform_driver_register(&fake_platform_driver); - KUNIT_ASSERT_EQ(test, ret, 0); - - ret = kunit_add_action_or_reset(test, - kunit_action_platform_driver_unregister, - &fake_platform_driver); - KUNIT_ASSERT_EQ(test, ret, 0); - - pdev = platform_device_alloc(KUNIT_DEVICE_NAME, PLATFORM_DEVID_NONE); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev); - - ret = kunit_add_action_or_reset(test, - kunit_action_platform_device_put, - pdev); - KUNIT_ASSERT_EQ(test, ret, 0); - - ret = platform_device_add(pdev); - KUNIT_ASSERT_EQ(test, ret, 0); - - ret = kunit_add_action_or_reset(test, - kunit_action_platform_device_del, - pdev); - KUNIT_ASSERT_EQ(test, ret, 0); - - return &pdev->dev; + return kunit_device_register(test, KUNIT_DEVICE_NAME); } EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device); @@ -94,19 +46,7 @@ EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device); */ void drm_kunit_helper_free_device(struct kunit *test, struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - - kunit_release_action(test, - kunit_action_platform_device_del, - pdev); - - kunit_release_action(test, - kunit_action_platform_device_put, - pdev); - - kunit_release_action(test, - kunit_action_platform_driver_unregister, - &fake_platform_driver); + kunit_device_unregister(test, dev); } EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device); -- 2.43.0.472.g3155946c3a-goog