From patchwork Tue Dec 5 01:22:09 2023 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: 13479278 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 ABCC6C10DC1 for ; Tue, 5 Dec 2023 01:22:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0897610E45C; Tue, 5 Dec 2023 01:22:53 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97AB210E459; Tue, 5 Dec 2023 01:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701739369; x=1733275369; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=fjOvoKoE7FoYZU8Y5WeV6FhrhaR4HqmgoZB73ZCk9u0=; b=EgIKtLAKZriE4axa4A0aPNuZO7YirsUGmzPAzwO4iLiqraEgh5ps1yaT d+J/y62qTLuHKHI8LadRD7nbiYywvaI4+Vy2e9f/KDImriSFgELyuWaNZ 2jrWUIIs0AuX8mGQJc45hiXii+L55Pc/zxxak2gdShCKOg5ehCKdTV7af av69knq0oulZikVvqKYkYzzbQ6t7YQXSq5TASkDFocUa1hayleR+rF7Ab vIDsJzDKDk4EaCeFCg3KioVk+afXLVXeYj/9bf3qH8FUJhhJ4HYD2QlFv hPbCqXPyFum9Oa+vhCq3T5YyE0kSlZ2m95oEXVtac4rG8xD87Z23e2qkz g==; X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="7151574" X-IronPort-AV: E=Sophos;i="6.04,251,1695711600"; d="scan'208";a="7151574" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 17:22:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="841256618" X-IronPort-AV: E=Sophos;i="6.04,251,1695711600"; d="scan'208";a="841256618" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga004.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 04 Dec 2023 17:22:48 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 4 Dec 2023 17:22:48 -0800 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 4 Dec 2023 17:22:47 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) 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.2507.35 via Frontend Transport; Mon, 4 Dec 2023 17:22:47 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.168) 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.2507.34; Mon, 4 Dec 2023 17:22:47 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GL/6cWlbCHSBbsAnAPY3+TILqVezCWHwnhSoC+bm9mCaZjdnlBJ5iJAibWdmQMbNuJQpEpmvYObxIHkteXNHhZIZnK5fVfq3YTEWOXz1TMHIYB13K3kbWaIMzpeX5T876v8ccEQ9sEIdCdA4vZ4KDert2Qw+f0+nFZbd/bRDTXbwP9Ilp6LAM6Txe17Xg0mBH0dug8plDPZvd/PkSYqaklDddzTU44OHbv5UHGPY+udVhAkm/zQ2EscHzvGtfkRpPZomQoc/dPSxUhz7jEPLAU0cKSJJCHhvZq8mjEFJ9w3dypcbiIIIUGrMxtfq7vfNtEkRsMXShLICqqZJsiuUaQ== 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=k2D/ATJrcGk0fCVN5kw/QrKrkOcarnok80rueSo9RRk=; b=nxTWTbVIyi6lH+J3EA+Tesh3JgFLs8JtBYae992uDfyCqydg4AZ3lAaWi1r5V8kTc2zIwGXzW9RVypuXHqpq/QgimXpDCzyTRnoDFD5u+RO6ptPBi/QkQonvPOdNO1hX0FLPoM9NotJOF8Cu+BPMZqOiOqzSmFgnfH9xTinpFqb73cl30btDUZcVmg/i/NSritt92I60PHrL6bi5B0126VcVJq15y0EgIGEgoqkzRo81aINsH3n2i1u31JLPsUJi2TPOkFX8JDc0bPaEPMa/Uex0xjc+bJJPYEI900YCe2h9vVFtPBEczTTpk6sZoydmGlJlBeDX/lPEyJQsPhFwqg== 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 SJ2PR11MB7618.namprd11.prod.outlook.com (2603:10b6:a03:4cc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.33; Tue, 5 Dec 2023 01:22:45 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::f105:47dd:6794:6821]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::f105:47dd:6794:6821%4]) with mapi id 15.20.7046.033; Tue, 5 Dec 2023 01:22:45 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , Subject: [PATCH v2 2/3] drm/tests: managed: Extract device initialization into test init Date: Tue, 5 Dec 2023 02:22:09 +0100 Message-ID: <20231205012210.1491532-3-michal.winiarski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231205012210.1491532-1-michal.winiarski@intel.com> References: <20231205012210.1491532-1-michal.winiarski@intel.com> X-ClientProxiedBy: FR0P281CA0067.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::21) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SJ2PR11MB7618:EE_ X-MS-Office365-Filtering-Correlation-Id: 4de0bfa0-4a5e-4d13-a688-08dbf530af88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VJUE+rlFvwU86Bs8nmF95SHEpB3vBL/EbYUr07wxeikmsbqsozyAszIytO/LAsC1F9L72U0y4naOhqIV6xnADm3lUF4vaNdAj4bAc/hjJIeXb2xkIJbNSdqITpSMEIc4BrTQtQsx5Il7uWNUNyx20ui+ksSebHayb9ms3fplALEbxH7PuMIJUdj6VLOX+O1myQYfvBO6aY5w5L8oXTGRpbpr/l83OoFki3zChRBAdZBrSaDHqi+epoMR/koVt/X1wg7Qdax4RdK/Zi6cbx+s0z2GKaGr4W0Di8gHSpKuq9ftAVCuyTUlLINrhcKN6a7gO/dNnnleycXP6SnYFOrq2vEL8r1/PSsWX+zlMwjhujLntTUdPg8qr4rckPP6CHuv7oZnR/X5uRVPUz+7sieick4atENO7nDq9BRk4ZQjXXhTbCCOFs8BIRzr9eTT/Pm8MWGWlyjYF1qf5dybQm8vmAgJCUubNBS4ZxpVLT7X+e/IYtsel4UUNI40LLZGUjiHQ/ai73zh+oClgCTtfEHtlsQT9S0H79T21NIQjy0yXOTu7wMuNTWnEjKd4mowfebT 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:(13230031)(136003)(396003)(39860400002)(346002)(376002)(366004)(230922051799003)(451199024)(64100799003)(186009)(1800799012)(5660300002)(86362001)(4326008)(8676002)(8936002)(2906002)(7416002)(41300700001)(6512007)(36756003)(1076003)(6506007)(2616005)(82960400001)(6666004)(83380400001)(6486002)(478600001)(26005)(38100700002)(316002)(54906003)(66476007)(66556008)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?YB30VFif/UPEBevrE4KtifzN6dnq?= =?utf-8?q?i+q3Syr6vPKsgzH3vqO955ak7ipaPNJN/Z7Q4Of4naH8g2k4kyQJ6gA1IHzYUNmvY?= =?utf-8?q?VTG40c6A1lfg4YaoV1V5pR3QAAayFJLOywAB8LOKuV3s1458rrjjBXWkpJNgJMEUH?= =?utf-8?q?rJgdCQ34H21u0fWXB9p1GJyi3aI+jtzqBiav0Glg6va5Qjh3CYV8SlH1ZSz2sccTd?= =?utf-8?q?KjKBMmsfOV8cD/GFRPSdVgIOGxZ6NP9Shk7C6GbnT5siHp7NWh4aj8Z5b8gNZIBpw?= =?utf-8?q?sJ6E3CAesHuGWMTeczxcH6f1vmq4dxM+fDwR2QGyKKJONAAeZ/MgjFrHUIc6MN+uC?= =?utf-8?q?pqID05GlX1Ou0p6wwSkjxT0kpXDyG6kl2s4Dw/EfI+D7oAdZehnVh7Mcs0qo1r40R?= =?utf-8?q?azufaJrwB8BpSazqxgnH2TCzWhvgOG9NXJAUbxkcqp6TC/M2PJ3JQcfGBi/LSH+30?= =?utf-8?q?GWNggYCYJYHH6MTLrs4aO5iajgptaBt5ITAvElNls4LtdKPttahJG2mLd4XlIjNEN?= =?utf-8?q?7uIskRBxDwMO6gYCbGP/k/NKCtoY/VOzRhaztMgZqOb8yCOQWslOhbGmlb71IGJXV?= =?utf-8?q?WBiepH3MxyV+983ooEcMJ8X8mB8Km7X+eiGd+i+ZHRWcguiV+hMio666m1GgF5bVx?= =?utf-8?q?P/1fK2kQBtVX1U5V3mPEza2f6Rfbip1ojtvYCGryPn3A4n2DG0HO9K9d/eJgGfvz2?= =?utf-8?q?1Vg09ErD6gx0bEiAWWbC8aT73YaMYBRCddXK/30kz7XXBktqpAZdE/k8vxIhmqtMF?= =?utf-8?q?TAhrJqYj854e6wXgvsueFH+YEVC8rSLOeMgZECYgsVL/3ButyiwYdcvim+Lamgxl4?= =?utf-8?q?3+0B5Bd03LgPdpOLK6PsaK4wrAGIsTTB7OsMtHtq+XevVqUmFKEg2+RWCvCQfdORC?= =?utf-8?q?cMpgGrLtjbgFnpOSTOvnrLk6d9jwKqB2KxYQ3ff3wAEFTg84QhqxABiFmwOwLv4ML?= =?utf-8?q?OXbe8rlA551LimmVvZUNebX1iwUsa63rzXDoxZOPdlA+aEwRy01pPkx16nVuzBuPg?= =?utf-8?q?PutBABAOGgBngqzzYGsCx/Ga6Ggx/WiahGT0bHiTPasnxZV4cSXSdnHJAw8DmaSzL?= =?utf-8?q?KRsNiAHP7ASYWEznmuh2YMttKrkZBZSzlNJ1j0mmlFWf5VfuvNOxndUsn1voWOxcC?= =?utf-8?q?xDrhhipbk/L+92X/1Tw1WxJKqe5movTmPQsW9whl148vW0gT0JGtF0958cBx4TdDt?= =?utf-8?q?v0jmoIhAr67XYLdEI6Wi57ctyTkTesU6OKiDm6Kj/9DcREnji3lFsbGB6zLdVAM9G?= =?utf-8?q?5GUmeGcUv+/K4ZPo2Tc+OCpS/xLS1fq5dL4wljcnSNEEMAEGLwqEJg0SmGG9EWzOI?= =?utf-8?q?9RTmoBR13ZI+6z40+iaQ4fEKY6ZK8kp0r0T9Sy+BMKUy1xKRPdGHPAJnHrN9xsAf6?= =?utf-8?q?QoPNbH5aF07sPh/oSbRjRgsPWT1nkNasfTsxZjvBWDqcOh3V2RtPslA7omBN4Qn2G?= =?utf-8?q?i+776uMzQmOw/WeBrnENIcYvYxjLF287pKjK1dhwf98Sgz4QOthPfJuKrHzXbv613?= =?utf-8?q?2/r1v3KTscSH0ICDaf3hHDqvkaaDCaiXxA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 4de0bfa0-4a5e-4d13-a688-08dbf530af88 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2023 01:22:45.6560 (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: gH16Y5fcsXL3NE3EBKP1Qdb//yY6cjYY+I84G9XYlD6YcB6QAeaa5dq68K1VOfpqjYA+OfubnG6GO0ib0pFMKo0NvngrCM+IU/WR/7EO+ro= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7618 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?= , =?utf-8?q?Ma=C3=ADra_Canal?= , Javier Martinez Canillas , Maxime Ripard , Thomas Zimmermann , Rodrigo Vivi , Michal Wajdeczko Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It simplifies the process of extending the test suite with additional test cases without unnecessary duplication. Additionally, store drm_device inside priv to simplify the lifetime management by tying priv lifetime with parent struct device. Signed-off-by: Michał Winiarski --- drivers/gpu/drm/tests/drm_managed_test.c | 43 ++++++++++++++---------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c index 1652dca11d30c..cabe6360aef71 100644 --- a/drivers/gpu/drm/tests/drm_managed_test.c +++ b/drivers/gpu/drm/tests/drm_managed_test.c @@ -12,6 +12,7 @@ #define TEST_TIMEOUT_MS 100 struct managed_test_priv { + struct drm_device drm; bool action_done; wait_queue_head_t action_wq; }; @@ -26,35 +27,42 @@ static void drm_action(struct drm_device *drm, void *ptr) static void drm_test_managed_run_action(struct kunit *test) { - struct managed_test_priv *priv; - struct drm_device *drm; - struct device *dev; + struct managed_test_priv *priv = test->priv; int ret; - priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); - init_waitqueue_head(&priv->action_wq); - - dev = drm_kunit_helper_alloc_device(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); - - drm = __drm_kunit_helper_alloc_drm_device(test, dev, sizeof(*drm), 0, DRIVER_MODESET); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, drm); - - ret = drmm_add_action_or_reset(drm, drm_action, priv); + ret = drmm_add_action_or_reset(&priv->drm, drm_action, priv); KUNIT_EXPECT_EQ(test, ret, 0); - ret = drm_dev_register(drm, 0); + ret = drm_dev_register(&priv->drm, 0); KUNIT_ASSERT_EQ(test, ret, 0); - drm_dev_unregister(drm); - drm_kunit_helper_free_device(test, dev); + drm_dev_unregister(&priv->drm); + drm_kunit_helper_free_device(test, priv->drm.dev); ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done, msecs_to_jiffies(TEST_TIMEOUT_MS)); KUNIT_EXPECT_GT(test, ret, 0); } +static int drm_managed_test_init(struct kunit *test) +{ + struct managed_test_priv *priv; + struct device *dev; + + dev = drm_kunit_helper_alloc_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); + + priv = drm_kunit_helper_alloc_drm_device(test, dev, struct managed_test_priv, drm, + DRIVER_MODESET); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + init_waitqueue_head(&priv->action_wq); + + test->priv = priv; + + return 0; +} + static struct kunit_case drm_managed_tests[] = { KUNIT_CASE(drm_test_managed_run_action), {} @@ -62,6 +70,7 @@ static struct kunit_case drm_managed_tests[] = { static struct kunit_suite drm_managed_test_suite = { .name = "drm-test-managed", + .init = drm_managed_test_init, .test_cases = drm_managed_tests };