From nobody Thu Dec 18 08:52:07 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 11383C10DC3 for ; Wed, 29 Nov 2023 22:15:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234257AbjK2WO7 (ORCPT ); Wed, 29 Nov 2023 17:14:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231402AbjK2WO4 (ORCPT ); Wed, 29 Nov 2023 17:14:56 -0500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AD30B2 for ; Wed, 29 Nov 2023 14:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701296102; x=1732832102; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=QycBI7Kt9PgTyJxaiH/+LWXtKXKuLCo9OVwQRLqdWtI=; b=LdJAcQGyEcMrqFa+vgAccrfZW//bkSSxJsr+1uXtygQhmVKAbUAW+y3/ N9x20Q6gtJgDy8TuOLP+hYjMg04KmWwCjRGd4X1AmoDAxfWzblnEjkhwV //5flBMawXfa2uYKzmuv8uh/3C1BjTxsCkcRTguBjS5KwtWWUdjvKWJR+ M/pP7bV8eY0bpFJwn/g6NuRjOVcpoMhYyOOGLmIKS4WNcZ8Cmu/Glt4w2 cyPv6r64Ke13zs6C1wBmgioqjA8BVOWwVodV95rPId6roLRS5M7WRfv17 QcjhKAIujTimEiJ8QHYtm/55Upyxq2ntjDnD3wUqZJcCgoLwj7Zz+jZFR A==; X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="11935312" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="11935312" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2023 14:14:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="912984151" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="912984151" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Nov 2023 14:14:48 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Wed, 29 Nov 2023 14:14:48 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 14:14:48 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Wed, 29 Nov 2023 14:14:48 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IVptYmUGJp5F3k0ylP+qIo/rE+U1KK+MjvDjGGgENiYFXEX2M8G+GT12rJ5+wFQzfVr6flN6GAT3sTmOOxM1tbASBRc+0+LNsRIOsy89T+/tg709c1f+zCzeUZ9x7FpqBH1GgxI0boggeluJwrJlDj53qWTTEaSEt9dNBOl61O09fFn8Jaqbkg2cvn7AkY17IRPCjss9iEAGsNk2uisnV/DEhkhtThel7oqjlNgR/PMwkoSDGRbUYBCzGHKcqjbvMWnI9tu26QkKlL+931zmvA3fUno0dbFnuMEKHCTiJXtCIJPzXqY6sUbfid2af22ns7eHI5WpwoWC+50UWhTlkQ== 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=ZmFrd6XZVfmcX6t5o754wGjAQjnYdG1Cx10L3HP9BJc=; b=GeBqhSc2Q/Udmk7YaIAddHCxzY1XZReQJxVLmCKpLXFr9UiYMuZ5nt+CI5FMTYzZC6V6U6u3yr9OJQsRTTefUDPaCoEjX2fB5Kmvr4N+boYHt8QfdGT9ZRnquTQAHvBqMJVp4v5N3SHyFmwwL917AQ+PsBSisczGw1BoWwDRqgcQG4f0D+ZOldnuZB6WBl8b9VhTYPiNqOBnurhqdrIrLSEsAOuzMs2Y0+AWejEznM9QA1qEDh3NDFuD2SZhxaNHPRoTAgAMHcdkOlXEwohFE2C98o1LWivcsNBz0LIDtn+RCf3U5xz1dE+88OXB5a66EKxJZ4QRLvOnDO9mkolTEA== 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 CYYPR11MB8432.namprd11.prod.outlook.com (2603:10b6:930:be::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29; Wed, 29 Nov 2023 22:14: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.015; Wed, 29 Nov 2023 22:14:45 +0000 From: =?UTF-8?q?Micha=C5=82=20Winiarski?= To: , , CC: Rodrigo Vivi , Michal Wajdeczko , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Javier Martinez Canillas , =?UTF-8?q?Ma=C3=ADra=20Canal?= , =?UTF-8?q?Micha=C5=82=20Winiarski?= Subject: [PATCH 1/2] drm/managed: Add drmm_release_action Date: Wed, 29 Nov 2023 23:14:11 +0100 Message-ID: <20231129221412.1180549-2-michal.winiarski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231129221412.1180549-1-michal.winiarski@intel.com> References: <20231129221412.1180549-1-michal.winiarski@intel.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: WA2P291CA0044.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1f::20) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|CYYPR11MB8432:EE_ X-MS-Office365-Filtering-Correlation-Id: f2a50c92-ea8f-4863-7dab-08dbf1289806 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uxMFSmOZIQJYVb+NrQ5AmIpk5hyr81KUOkQL8z020l306l2mZ9f7rboUFztSNWD+Jd02lB3OxGo/84CmvyDtJdHGjwOMgqYbDC53OXZVsFxOFvakVJRUvYTNNCCfyHtzPNw6aR3XZBb5E9qpD/G5I0SfbgSscbF/+PNF+RTYQb0eQNYXYris9oAhZK5EGIHCPWmwSh/8dXxuJX4wvSeUVJKZ0t3nJDZG8WtUmXuwImZ2FTsi8BLhuWGMulyUsr21q5+Buz80CHDYFO5ppftqs7ro6W5PntOSg7s2xD2mClnN+nUzEgt6xGD/tQKBJsP9751EIkk7a4RhsHxH4JK+L/0/vf5jz/1/us3G3V1PXqntFZ06TwMkEtN+hMUtPwNjf9ou3JPqBJa/nHxdJhpMnHdp7rHTOQGINUgzZ6l47UGnlD2FrEt8qZhZM8j2SxLBmGRO6rMa03y2qtl6T3LAz4Okr9wSEo1C8b+3PWvl1Un2AtIllc80MbvExhvfounCdTywjc01RGQpcQjY0b+at/6QHTO/GE2nltgL7qZltyGgfWcOzkDJkRKP8MF4jsJzLM5R6t98AwMWPq7ND00/tXLF1vHdn3bz/bh/M2X2Ek9zXoOTSsjj+VnMcjpCZPAB 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)(366004)(396003)(376002)(346002)(136003)(39860400002)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(36756003)(6506007)(41300700001)(38100700002)(2906002)(83380400001)(7416002)(82960400001)(5660300002)(26005)(86362001)(1076003)(2616005)(202311291699003)(8936002)(4326008)(8676002)(6666004)(6512007)(6486002)(478600001)(66946007)(54906003)(66556008)(66476007)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U0NYVjlqdHBQcEhHV2ttYVZmNjVNYUhNZUFaQXp0dGxYbThjeXZwQUlXZXBs?= =?utf-8?B?NTkrcTd1QUhhWFVpSWJKajFwc0JINktHQkpOS0pjd21QM1BKZjllVGFPMjBB?= =?utf-8?B?bE5tSXRKaXQ4UUF2U095SklpZ3lWdnR2UTlpay84M2RMS0tpOWRQUzBsbmtU?= =?utf-8?B?cTBrRVg4R1RhTENsQ0l1YmllVkNSZGdVam9oVkxlK053MHhFZWpsMzJWY2ZS?= =?utf-8?B?SUtvSWVXTmtYaUFpRzdzY3ZIazQwU3hCOGZWSWs0angzc1JKTFlHWUNZTE1F?= =?utf-8?B?T2hDQ2xPeWxVaVMzZEJPN2RINnFVeE9EU3kwN0pnR0YvVml6ODBpcWZjeU1U?= =?utf-8?B?T0lyMk8wNWszL2pFZ2M4VG9GR2llTkFEY0hqNzZmR1RRTzBYam1JUGc5VTBI?= =?utf-8?B?aThoWUhVNE9tL1RjMXg4NmtaWDhCcnBaYlNSaHpvM1FyK1I5MTh6cjlKSFFN?= =?utf-8?B?UVhpdVdNa29zWGdTYUZON2tIOXY1U0RoR0d2S0VrNlZYMk9raTNuZ1dHSmV6?= =?utf-8?B?TWhpZW1PbFUrazBLWjIrdmVOREFHSXZPM0ZxZGZRZlE3SThGaE1qcEpyY043?= =?utf-8?B?ekZUWGtNdDExZHI1TmM0QmR2cnFnUFhEVk0yQUo3UVFGeVVIN2Y4SEJRdEw2?= =?utf-8?B?ZldhbE0wWGdCRDEwTlNlYmtwcUhmdU1wME93N1hqWEhLa0tYWFNuSjVxd1F6?= =?utf-8?B?Tk41cnBqOFZiVkgyb3RaN25nTmxLUmV4eEhBOWU1U1dJTmhYcEowTVlYZTNE?= =?utf-8?B?c2lxWEpZWUtHRzZCTHdQRld2WGdVdWhMMXVNcTA5bkhqZ3MyTVl1eFhkb1Ay?= =?utf-8?B?LzA2N3ZVU3QvTkpKZW4yMER1bVZCeXFxNG1vQ0tETWIxWGtZOHBJcXZUeE0z?= =?utf-8?B?T0RBVnQyYWtqVkI4ZDdrRlRVQmhnL0x3QUh5UXRDeWdySDdScUk5OEovSEtB?= =?utf-8?B?T1liMG14cStWb2tlYUR3Z0JIL1VzbVlWRTloYWJ5SVh5ajB1aFkvWk5adzc4?= =?utf-8?B?ZEV0RkoySUtwS2FqQUR2SXFERlgvZWxIcll0Z25makZOMHFIdFdvb3BQWEFT?= =?utf-8?B?THZYQXg3Rm03U2kramRiSUphZG5LWW9YS0ZoYXc0V0Qxc1lsU1dJTHR1L1pp?= =?utf-8?B?R21uL2gwZjBWQlZvM2FMU3NxS2JXdUIzMmE3YVRseURxTzQ3MUg0VjBvL2xR?= =?utf-8?B?TUc4WnBCSkViTCs0Q3g0Vyt2RmRvMmJ0c3FDWFh4Tjc0U213NmpuNUxQVWRi?= =?utf-8?B?Tjh3MlEySFp5MEh2cjNsTmU3VjhTOVUzeEpBMTcwem1HZjlRTDhWRm1sSnBh?= =?utf-8?B?Y0llT2JvK0szVGpyVXJFSGRpd2xhNkxlYURmTFVBbXJhc3RWVDc1TzRLRDd2?= =?utf-8?B?SnNHd09teW1KNXNQWTNyaituZTJtU0tZdHlkemFRTDE3RDhjenI2MCtYdTRh?= =?utf-8?B?Ni9hQUhNVnFwZ3plUUtDTmZSWVB0OU9sVE5YN3pxOHhOSDhEeFEyc0VmdFN0?= =?utf-8?B?QnNjanZwcUhJMktHd1hpZXRvbzFDaWxBMkxOK2oyVVdpTktKQmlyRWNqSjZJ?= =?utf-8?B?Q1NhdEk2U1cxVUpPV1MyRWlQTzMvZEd3Tmd3UEtJeE5TSXc2M2NLRDdKRWdK?= =?utf-8?B?Wldab2hSRktpS3BiWGNweENIY1h1Q1JwVkNyVUJWd3lZZjIwNFBLWGpjK05j?= =?utf-8?B?VEQwbUJCSGFqY0hTODZQZzNrcWNYWUVTUTJMTmdXbmtCUU9zd09CM25zMFBC?= =?utf-8?B?ZkRBSlliUytuNTFCTjYxMy9GWHEzZ1o1aHBERElzWGxsNDVYME4zQktsa3N5?= =?utf-8?B?QU1rMmw2UUFLYUg1ZzhYcEFCZmdWdTBQK09vYk1MMHhONzQyYjdUWTA2WU9z?= =?utf-8?B?TkZsamdtaHhoMWVzVENNK3BoQS9LN0E0WVNlUlNnYVRKQUttanFsYTJ3Yllq?= =?utf-8?B?TExhaVBTN3E4c2xNZnZqenhtUnY3WVViN0ZNNVBIcmRVMVc3bVpSbGk2UE5v?= =?utf-8?B?bERBZHNQOFJaYkhESlFRNHgyNThGZEt4S2UwVTZXQUd0NEJSL250TnpiZHhD?= =?utf-8?B?Z3g4a09JN0ZoeGJ1Mk9BMXBWZXdlWTVFQ0ViSm92NjJFVnN0SnczMEhxWmdq?= =?utf-8?B?ck9DdW9DK0ZxRmpvSHNHanJkZkptMkYzWmluMjVFTWpOak5PbG5ZN2JLQUVr?= =?utf-8?B?eUE9PQ==?= X-MS-Exchange-CrossTenant-Network-Message-Id: f2a50c92-ea8f-4863-7dab-08dbf1289806 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 22:14:45.5696 (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: lfvecdOGDugG0VjZp4LfQVMqZrDkvSJ+ZZaihKkDq19M3fpyw564pkkuatWYhJvij74ZKOtWkmYLm1vtLEZW1W/Z5+zJUEASeayKFyzVKmA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR11MB8432 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Similar to devres equivalent, it allows to call the "release" action directly and remove the resource from the managed resources list. Signed-off-by: Micha=C5=82 Winiarski --- drivers/gpu/drm/drm_managed.c | 39 +++++++++++++++++++++++++++++++++++ include/drm/drm_managed.h | 4 ++++ 2 files changed, 43 insertions(+) diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c index bcd111404b128..7646f67bda4e4 100644 --- a/drivers/gpu/drm/drm_managed.c +++ b/drivers/gpu/drm/drm_managed.c @@ -176,6 +176,45 @@ int __drmm_add_action_or_reset(struct drm_device *dev, } EXPORT_SYMBOL(__drmm_add_action_or_reset); =20 +/** + * drmm_release_action - release a managed action from a &drm_device + * @dev: DRM device + * @action: function which would be called when @dev is released + * @data: opaque pointer, passed to @action + * + * This function calls the @action previously added by drmm_add_action() + * immediately. + * The @action is removed from the list of cleanup actions for @dev, + * which means that it won't be called in the final drm_dev_put(). + */ +void drmm_release_action(struct drm_device *dev, + drmres_release_t action, + void *data) +{ + struct drmres *dr_match =3D NULL, *dr; + unsigned long flags; + + spin_lock_irqsave(&dev->managed.lock, flags); + list_for_each_entry_reverse(dr, &dev->managed.resources, node.entry) { + if (dr->node.release =3D=3D action) { + if (!data || (data && *(void **)dr->data =3D=3D data)) { + dr_match =3D dr; + del_dr(dev, dr_match); + break; + } + } + } + spin_unlock_irqrestore(&dev->managed.lock, flags); + + if (WARN_ON(!dr_match)) + return; + + action(dev, data); + + free_dr(dr_match); +} +EXPORT_SYMBOL(drmm_release_action); + /** * drmm_kmalloc - &drm_device managed kmalloc() * @dev: DRM device diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h index ad08f834af408..f547b09ca0239 100644 --- a/include/drm/drm_managed.h +++ b/include/drm/drm_managed.h @@ -45,6 +45,10 @@ int __must_check __drmm_add_action_or_reset(struct drm_d= evice *dev, drmres_release_t action, void *data, const char *name); =20 +void drmm_release_action(struct drm_device *dev, + drmres_release_t action, + void *data); + void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) __mallo= c; =20 /** --=20 2.43.0 From nobody Thu Dec 18 08:52:07 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 D5DCBC4167B for ; Wed, 29 Nov 2023 22:15:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234803AbjK2WPD (ORCPT ); Wed, 29 Nov 2023 17:15:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229658AbjK2WO5 (ORCPT ); Wed, 29 Nov 2023 17:14:57 -0500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E222C1 for ; Wed, 29 Nov 2023 14:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701296105; x=1732832105; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=VCUqrEvbOgfljmKuVyn/aVdpbVNBQYXk9viQlZIVKtk=; b=a6+WFw8vzSBuSp7Bgxl4EuCvJkU4mzPJsci4aUNUba40O5kBBhJUsJtz 5Ga8WjPiokbmQtfmEIVRZr3UeOZai4yK02vOWVzRTcuqYj3whgq7eEnAW BuXJ3CVOU62Jy34pbyrJPgCaMmB52gIzWEnPneQ4Nce4Px9j5n3Fq3D8v +YlhVzTxdGZcxAUMdmUHMhsqbPKR7t4tnGtOcSF+IFL8xp3koIf2MbzQ8 AS4k4J/MSF2MwE+bKQtLEjm6O+Wer/m5cLSuEIzt9Gbv9U54FnXWvWahc UtSpZZqF5r1+teZAdsbIgJfQgFbjeJq2yDN8l3Khv6kAWyNp0pFov4JtI Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="11935325" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="11935325" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Nov 2023 14:14:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="912984157" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="912984157" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Nov 2023 14:14:52 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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.34; Wed, 29 Nov 2023 14:14:51 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 14:14:51 -0800 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.40) 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; Wed, 29 Nov 2023 14:14:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7cKDBLg0UIjTB7h7TlPFb4Nu17cxHupNOVD/HXtludY9nc+vMyFEvnhgOLYPuGKrc5xyhwfh9OeKzbHk8oJD1DYwCEoKtnOwDPrxdJfDgY7a+5viXf62bD0eGv6UzyH6N+zEbqUcpnJRzP+sNchGjJgYyLE4TLvLQ9rOdDSF3cpb0blZGs1RT625lUvCeIaQuiWi/ZZQeT7BACLmbvgnWQATMMKt4jAEWGSGDpS6dUkdD3L7j1BCYLv5/LWuP8zKvDMs0SNm2+U56uN7sHVr2G3IxLlCftb3+HcojuzBU/E0dRDjmG0KZ9WkwRi4lEU4ujGf+2jN0BmBC1mIJlcrw== 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=ea9DDKEx/y8I1Qv/Zpuy1E6FoPnW639S31vVs4kxS6s=; b=SH/aN2KKadBFG+t9WJ88HA+TSRg9X0o1yl8XynNqFk7+rdDAhCZqRkvrXj3S9Jn2p6dywOt2plNQ+eEncWfpYqk2wCY3y6OT3QMkrEbiMT1rUPKztuyeO8IQrSqjxSi+d9fZAu2QIdrduGOhR6TA0aWGhmGRTBhdU5rQJ5gKB3W34POAtF7YOejykLEyUe9SRIqarJ1W2fTRJaRzEHMHaRRnPaCiNNi7o8dviCIv+t0SKLBvv8xPmzmGgPOjuiUamLYLTj+PyvgaTT5OZdletV7+iMK70Pw9ivNwZ/oLov9+OCo6AExOIqyCCeZyyKEsYOkBdmg8MMSTAcq1WmLOYg== 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 DM3PR11MB8733.namprd11.prod.outlook.com (2603:10b6:0:40::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.23; Wed, 29 Nov 2023 22:14:49 +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.015; Wed, 29 Nov 2023 22:14:49 +0000 From: =?UTF-8?q?Micha=C5=82=20Winiarski?= To: , , CC: Rodrigo Vivi , Michal Wajdeczko , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Javier Martinez Canillas , =?UTF-8?q?Ma=C3=ADra=20Canal?= , =?UTF-8?q?Micha=C5=82=20Winiarski?= Subject: [PATCH 2/2] drm/tests: managed: Add a simple test for drmm_managed_release Date: Wed, 29 Nov 2023 23:14:12 +0100 Message-ID: <20231129221412.1180549-3-michal.winiarski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231129221412.1180549-1-michal.winiarski@intel.com> References: <20231129221412.1180549-1-michal.winiarski@intel.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR4P281CA0171.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::18) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|DM3PR11MB8733:EE_ X-MS-Office365-Filtering-Correlation-Id: 06f13fdd-b885-4ac7-681a-08dbf1289a95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tovgHS4uobpecGFlg9wtY3e8RTaFV7s0CTevNFvdbNJQ7KQZz2Bu2DmSGOWe2g05YST+1Rmh5MAnscnWGaBHkzifzvaCMy3mQxomAnDHBW9wbT4M2lH23cyQfhoKoU17XhKddvSqPJjSd5ZGJW6O3/j9w/q1UYyfNm8W1+4N76Y+WzCuZDAOCePp1dgrxds1vmca/Ajxz+sW4KHYRFHWs5j/xy69n5jIUIryud6+yzZciEe/YZmyUQ6+imHH2WRJTJJ7M3y8DWEzz45NmESSHPO6MnsUcx8H6VP62FpsWoYhsS6NHkbtzmYmkX0hxDiEqjlD5/1XH3sGuEcS2QG8/zvj7KuQ4roypcUsyAAi6/2YlAZnato97G6oQKRgAbEqorX4NSgxJcCreOWjD3/sqq8xujU1IZelDCMZTg0XEgWhAr44j9kLKDSM2PIIzhLsZ5iv6xRBBfEiIKR2ci3KN5ePdkGd+PB/2OTkkwNhs97/wvPp4xFy5b1sRPsORgHQ+tHRNtJAB7YMTE3m6Bkq/BmIOxO6Y/1hm+fo0wtv3MemaZ9j4CBtJiMmO+o7AAc1Nt+3YHgh+UxLh3IziLSvD/7OyHLhxseuxX/GNTu6+r/tSalzxsCaxvfZ6VzQ8C0B 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)(396003)(39860400002)(366004)(136003)(376002)(346002)(230922051799003)(64100799003)(451199024)(1800799012)(186009)(1076003)(26005)(6506007)(2616005)(6512007)(36756003)(6666004)(82960400001)(83380400001)(41300700001)(66476007)(66946007)(66556008)(54906003)(316002)(5660300002)(7416002)(2906002)(202311291699003)(8936002)(86362001)(8676002)(38100700002)(4326008)(478600001)(6486002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Wm13UVR0cE94bDhaZU9SdTNHZEI1WnRYblZkWU9nQXdBUnd6YlhMWWtkYzNH?= =?utf-8?B?RTF2UWVMb2o2b0JPZ2xFK01xbTJVZ1ZuK0ZLdjBFSWdMNmdJekY3Uy84bFRU?= =?utf-8?B?aFNOVGMxNTg4YTNuN3NSbXloYkVkRFlxbkFLWEpjU2prNUlsZ3ZTY3k3TzU1?= =?utf-8?B?endYUEdwZDc4bnMyTFpLdzFjUFU4MklTVmt6MW05R1NralpGYXBGRiszbEFF?= =?utf-8?B?RjM4SHdFUmFqcTFHdUF6V3Z4ZlFRVkEvMVFTME5peCtLL3ZnNWp1V2xoTHJv?= =?utf-8?B?TjBJeXJXNHVzMWFEcnIxdGRNWVVwams1Q1Jvazl3OE5TRnF6Y3p5SnJ5WDEr?= =?utf-8?B?eU9SS011N1BrU0ZtcnNucHlZeHNJazhwVU9TUHFFWHZWWmF3YkVCQkNKK2VC?= =?utf-8?B?aTRyU2tJUUJHTFljK1AzZklvYkovU2xVUGlZT21jdGpPZlpoMEtEc2Q2Slhh?= =?utf-8?B?bGREaTdibXg4NzFxTEFtTGFoWWZkWnRucEFHeitQQUxBMjdGOUJGRE4xRE0y?= =?utf-8?B?QWdIYjh1bmRaaFJLYStzcElpVHRRQlhyeEJOMHlibnk5MktDMm1uRnlHUE1L?= =?utf-8?B?OFJ6Z0FRL3F6UFRBbTBncXE5WlRqalc0RDVyd21WQXRlM0xsRFF0R084THFu?= =?utf-8?B?MTNXeUdLWGZwZm5RcEJ5NXlQUXp1bGVCcmJZQU82bllkN0ROWDFEM0NOK1dN?= =?utf-8?B?VThpeldGdXdIcS9zTW5qN1RGNVRaUi81bE1GQXpUVDlEN1c2MTcwdnp0Ynor?= =?utf-8?B?MVdnQkR1QW1tbUZxUTZTRldVR0ZPRmF0S0N6ZFhoQzNsQXZ5Z0s1NFh6d2NQ?= =?utf-8?B?aG1nVVZ6TkhRTDRwQWl6bTJ3ODFhREVML1dpbmNsOFQ5OXgxL1ZIZytkRHRt?= =?utf-8?B?eC9GNlhIcnNwa1FqOTh6U29CTVlCdDdYdDJwOW1kRkZSM0U2WDNkNG0yb21Y?= =?utf-8?B?MTBlL1p0QWpPMmFMSW9UM0FQYW1Jd2tJSm1oUWVvUGQxZmIzVnZ5d2ZqN3hj?= =?utf-8?B?YkFMdjB3aFJxa05PaG03YWUvUGczTDhVd2JtbGtVcXkrVFJSd0dncXFyUmRj?= =?utf-8?B?bGhNL0lKOE1wMFZMRVp3bk9ZekhMaHdtb2E5N212OUh1SFcxSlh6blFzYTN1?= =?utf-8?B?OHJkS3oxZXBhMVI2R3daZ0U5eGFUdXJLbk9DRHFNd1F3cHRvUHhEM0kxQTFO?= =?utf-8?B?Z3VPWHJQWUZ3M3VhcWRwRm5mSVl4aVFIM29tTnFPN1NnYWREWWE4VEJZQm9Y?= =?utf-8?B?VEs0N0p6RjZiWVd1eTVuYUVUQ1BNY3gxMnRQZ3N3R1c2YlhzYSs4L3gvdklm?= =?utf-8?B?dnJlUkk2M3ltakdNVGVZRTJleU90N2VBWXlnQUozTVVCQWNNVlh2YlBURERR?= =?utf-8?B?WFNybTZMSXZVb212NHo5R2lCRzJQQ2dteVo5SnlWVExvUHNXdG5yc2N1S1FR?= =?utf-8?B?Q2h6UE1wa0dxZlFRT2JKSmhaVWs5YzMvMXBFQUs4Uk5VOHMzR3FtS3JGUy83?= =?utf-8?B?a2tGUVF4T1p6RUVpYWR0VHJNNmVENHY3S1JHMlJnUmNQYXNDQkV2eFBnekRB?= =?utf-8?B?SWYrMkJKdzZQdTRGbTI3bHZXTGVuYjI5VEthdVVuL0M1TDYxa0h2WjhBei9L?= =?utf-8?B?aHQ1STVVMFB1WmV2OGVXeC9OQWNIajFFMFllMlZjaUFIMTF3Z2Jod2lWQXVN?= =?utf-8?B?REM4Z3p6Mm9QMHVMQnQrdnVackZ4NDhySUlseEpPWk9xN3NrS05oRFdNQ05V?= =?utf-8?B?Z3NINDU5TnVKcmcvc1BhYTF5M3hJeng4VTFlTVdtNDRvcHk1a3IzVUpUbzJN?= =?utf-8?B?OGxNT01raUtCaUFCMjhEL282empLTjE3Y2NVem1UVU9ZcWZyQmxZQUtJYXJv?= =?utf-8?B?Wm5YeVg1dDdxNHRxbERwN1l1dytJQWJHWG9mSUx0ZVEzRDhBMmZZQkw4TkVX?= =?utf-8?B?Y2tIYzZtMFhyMTgxSXdwK256Q3JFaVFhQnVOckQ0Rk1yQ1d3SURNbC9lY2dv?= =?utf-8?B?b3JsdE81cFBhRzdSQzRBaW9DTHQxRVM5dGt3VHlVWk90Z3hBM0luNmpRSWdm?= =?utf-8?B?b3JWTm4zblFFcER2UkFkb2phb3cyOXRwN0tPQ3VtblFVaERHRzZMVmgzQlRr?= =?utf-8?B?cXc5czFxQ2lpK0tYNVBiV3RRTUJVQklTWmdPNEdBQ2RBY241NDZJSGt6MnBl?= =?utf-8?B?clE9PQ==?= X-MS-Exchange-CrossTenant-Network-Message-Id: 06f13fdd-b885-4ac7-681a-08dbf1289a95 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 22:14:49.8485 (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: /6q64r6uKTL14MLPGqpNqC857I0Um+6t20RrWNlYS6y67LKNMUGvHHFWNcO837XpSResQPriBodRr+ybWmGt0sKaRCo5TFJj6eusUoPdePA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR11MB8733 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a simple test that checks whether the action is indeed called right away and that it is not called on the final drm_dev_put(). Signed-off-by: Micha=C5=82 Winiarski --- drivers/gpu/drm/tests/drm_managed_test.c | 65 ++++++++++++++++++------ 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tes= ts/drm_managed_test.c index 1652dca11d30c..a645ea42aee56 100644 --- a/drivers/gpu/drm/tests/drm_managed_test.c +++ b/drivers/gpu/drm/tests/drm_managed_test.c @@ -12,6 +12,8 @@ #define TEST_TIMEOUT_MS 100 =20 struct managed_test_priv { + struct drm_device *drm; + struct device *dev; bool action_done; wait_queue_head_t action_wq; }; @@ -26,42 +28,75 @@ static void drm_action(struct drm_device *drm, void *pt= r) =20 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 =3D test->priv; int ret; =20 - priv =3D kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); - init_waitqueue_head(&priv->action_wq); + ret =3D drmm_add_action_or_reset(priv->drm, drm_action, priv); + KUNIT_EXPECT_EQ(test, ret, 0); =20 - dev =3D drm_kunit_helper_alloc_device(test); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); + ret =3D drm_dev_register(priv->drm, 0); + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_dev_unregister(priv->drm); + drm_kunit_helper_free_device(test, priv->dev); =20 - drm =3D __drm_kunit_helper_alloc_drm_device(test, dev, sizeof(*drm), 0, D= RIVER_MODESET); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, drm); + ret =3D wait_event_interruptible_timeout(priv->action_wq, priv->action_do= ne, + msecs_to_jiffies(TEST_TIMEOUT_MS)); + KUNIT_EXPECT_GT(test, ret, 0); +} =20 - ret =3D drmm_add_action_or_reset(drm, drm_action, priv); +static void drm_test_managed_release_action(struct kunit *test) +{ + struct managed_test_priv *priv =3D test->priv; + int ret; + + ret =3D drmm_add_action_or_reset(priv->drm, drm_action, priv); KUNIT_EXPECT_EQ(test, ret, 0); =20 - ret =3D drm_dev_register(drm, 0); + ret =3D drm_dev_register(priv->drm, 0); KUNIT_ASSERT_EQ(test, ret, 0); =20 - drm_dev_unregister(drm); - drm_kunit_helper_free_device(test, dev); + drmm_release_action(priv->drm, drm_action, priv); + KUNIT_EXPECT_TRUE(test, priv->action_done); + priv->action_done =3D false; + + drm_dev_unregister(priv->drm); + drm_kunit_helper_free_device(test, priv->dev); =20 ret =3D wait_event_interruptible_timeout(priv->action_wq, priv->action_do= ne, msecs_to_jiffies(TEST_TIMEOUT_MS)); - KUNIT_EXPECT_GT(test, ret, 0); + KUNIT_EXPECT_EQ(test, ret, 0); +} + +static int drm_managed_test_init(struct kunit *test) +{ + struct managed_test_priv *priv; + + priv =3D kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + init_waitqueue_head(&priv->action_wq); + + priv->dev =3D drm_kunit_helper_alloc_device(test); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->dev); + + priv->drm =3D __drm_kunit_helper_alloc_drm_device(test, priv->dev, sizeof= (*priv->drm), + 0, DRIVER_MODESET); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm); + + test->priv =3D priv; + + return 0; } =20 static struct kunit_case drm_managed_tests[] =3D { KUNIT_CASE(drm_test_managed_run_action), + KUNIT_CASE(drm_test_managed_release_action), {} }; =20 static struct kunit_suite drm_managed_test_suite =3D { .name =3D "drm-test-managed", + .init =3D drm_managed_test_init, .test_cases =3D drm_managed_tests }; =20 --=20 2.43.0